Commit Graph

46379 Commits

Author SHA1 Message Date
SzuWei Lin dade85dd47 Merge "Add VNDK v28 to GSI from Android Q"
am: 5c3907f922

Change-Id: Ibcbfd59c0cecbfbed5fc3ac5e9f3dfac89bb72c8
2018-09-17 03:20:43 -07:00
Treehugger Robot 5c3907f922 Merge "Add VNDK v28 to GSI from Android Q" 2018-09-17 10:00:54 +00:00
Roland Levillain f16ce8df3c Merge "Revert "Make package functions take an argument""
am: d55eb7643d

Change-Id: I6939be3b2efe8ce3e658aea21c8a1471d096398b
2018-09-15 09:13:31 -07:00
Treehugger Robot d55eb7643d Merge "Revert "Make package functions take an argument"" 2018-09-15 16:05:39 +00:00
Roland Levillain 70bd104353 Revert "Make package functions take an argument"
This reverts commit 5ea65dcc5e.

Reason for revert: Breaks some ART gtests on host.

Change-Id: I314692e31628a14d824e28544fdb3c765fc100f6
2018-09-15 12:46:44 +00:00
Colin Cross 99bd49a9fa Merge "Make package functions take an argument"
am: dcfdb91c07

Change-Id: If22f890b71e410e34799933b8848af9b639712c2
2018-09-14 20:25:13 -07:00
Colin Cross dcfdb91c07 Merge "Make package functions take an argument" 2018-09-15 03:16:56 +00:00
Colin Cross 1fe6d8c6f5 Merge "Remove LOCAL_DONT_DELETE_JAR_DIRS"
am: 7f583f1e57

Change-Id: Ia1d3fd485490ec2fc9e1f720f49cd7a4babcb0b3
2018-09-14 19:29:09 -07:00
Treehugger Robot 7f583f1e57 Merge "Remove LOCAL_DONT_DELETE_JAR_DIRS" 2018-09-15 02:14:24 +00:00
Colin Cross 5ea65dcc5e Make package functions take an argument
In preparation for rearranging the way jars and apks are built.

Test: m checkbuild
Change-Id: Ib9f0da132196942062c58fd5b12e84588106724e
2018-09-14 16:55:18 -07:00
Colin Cross 405b30fb4f Remove LOCAL_DONT_DELETE_JAR_DIRS
There are no users left in Make.

Test: m checkbuild
Change-Id: I896fc6b889aab556c6983c374421e4c5381af54d
2018-09-14 16:55:08 -07:00
Steven Moreland 884bb6f113 Merge "Disallow accessing Treble _OVERRIDE reqs."
am: 79b9c20c8f

Change-Id: Ib8ddc7d19ebf536334ca2887c048bf980d7b8a46
2018-09-14 11:07:44 -07:00
Treehugger Robot 79b9c20c8f Merge "Disallow accessing Treble _OVERRIDE reqs." 2018-09-14 17:49:51 +00:00
Anton Hansson 18b20d7644 Merge "Re-write the module override logic."
am: 3ea8ca5ac7

Change-Id: If9deb873ac93a8053d7f286da83c4bf7b20f73ef
2018-09-14 01:08:52 -07:00
Anton Hansson 2b53ba0ada Merge "Move product-parts of tags_to_install"
am: 013251906c

Change-Id: I6a36a2084e43c50979af3307aba57113ff4477e5
2018-09-14 01:07:35 -07:00
Anton Hansson 3ea8ca5ac7 Merge "Re-write the module override logic." 2018-09-14 06:42:10 +00:00
Anton Hansson 013251906c Merge "Move product-parts of tags_to_install" 2018-09-14 06:41:58 +00:00
Steven Moreland c2e80afb28 Disallow accessing Treble _OVERRIDE reqs.
If something needs to distinguish between _OVERRIDE and non-_OVERRIDE,
it is a hack (these should be the same property).

Bug: 114488870
Test: m nothing (exercises this)
Test: searching all of these reqs in the code.
Change-Id: Idc22150a3179d025d7d95beafad39e8b07946ef8
2018-09-13 16:57:51 -07:00
Brandon Lee e17d8163c1 Merge "aidegen: add extra info to collect in module-info."
am: 076b905763

Change-Id: I3c32064f08f07d1e1dde130d5d248adf6519395c
2018-09-13 16:48:03 -07:00
Treehugger Robot 076b905763 Merge "aidegen: add extra info to collect in module-info." 2018-09-13 23:35:41 +00:00
Steven Moreland f484673f9e Merge "Remove HIDL libs from PRODUCT_BOOT_JARS."
am: 44199a57da

Change-Id: I4d32f0c8a836c57aef7fcc224a2cc4da6d3da621
2018-09-13 09:26:52 -07:00
Steven Moreland 44199a57da Merge "Remove HIDL libs from PRODUCT_BOOT_JARS." 2018-09-13 15:14:35 +00:00
Anton Hansson 948615083a Re-write the module override logic.
This makes the product-installed-files macro more accurately reflect
the files installed for a given product, as well as fixing bugs in
the previous implementation.

Specifically, the complete list of overrides found so far is stripped
in each round of expanding required modules. Previously, overrides were
stripped out *after* expanding required modules. This meant that for a
scenario where B depends on C, and A overrides B, C could get installed.
It's unclear if this was a problem in practice.

The other effect is that the offending artifacts txt is more accurate,
since overridden modules are now correctly removed.

Bug: 80410283
Test: build_test downstream
Change-Id: I8bfc7c40bedd5cb2afba567bae4b998f51770793
2018-09-13 07:51:08 +01:00
Anton Hansson 68c5fe4cca Move product-parts of tags_to_install
This makes the product-installed-files macro more accurate, as it will
now include the eng/debug/test/asan packages for each product involved
in the analysis.

It also fixes a bug, where packages in e.g. PRODUCT_PACKAGES_DEBUG
would not get their REQUIRED modules installed prior to this change
(I think).

Bug: 80410283
Test: diff modules_to_install on an internal product
Change-Id: I8e148454df2f96523bbed25e2695d050559968f1
2018-09-13 07:51:05 +01:00
Jiyong Park 95dc143686 Merge "fix: linktype for recovery modules in ASAN build is native:platform"
am: 007f27aa4a

Change-Id: I44f52c1ddfcfdb1653797de557992c3b8a5f121b
2018-09-12 17:15:31 -07:00
Treehugger Robot 007f27aa4a Merge "fix: linktype for recovery modules in ASAN build is native:platform" 2018-09-12 23:54:48 +00:00
Neil Fuller d3340e4aa4 Merge "Move signapk to a dedicated "host" target"
am: 78f4fbeb53

Change-Id: Ic76a870c8f3fcca68dbc816823a430bf4709f272
2018-09-12 10:39:10 -07:00
Neil Fuller 78f4fbeb53 Merge "Move signapk to a dedicated "host" target" 2018-09-12 16:20:24 +00:00
Steven Moreland ccc7ce1050 Remove HIDL libs from PRODUCT_BOOT_JARS.
These are left in PRODUCT_PACKAGES so that they can still
be added to the classpaths of legacy targets.

Bug: 77307025
Test: boot Pixel 2

Change-Id: Ib14969291319e03f181b9ea4d40096de095137e7
2018-09-12 09:17:01 -07:00
Brandon Lee 5568c19ae1 aidegen: add extra info to collect in module-info.
- add "dependencies" and "srcs" to collect in module-info.mk.
- add "Srcs" in core/base_rules.mk

Bug: 112523202

Test: make out/target/product/generic_x86_64/module-info.json and
      generate out/target/product/generic_x86_64/module-info.json

Change-Id: I0669377b2e5e6b4ee225f1930bda208eff092dea
2018-09-12 17:39:32 +08:00
Dan Willemsen bc5b7335c1 Merge "Fix ASAN + product_services"
am: 1c1e258835

Change-Id: I5a3bb20b256ec77e38bfcbb5e7447b7c2d4538a7
2018-09-12 02:30:55 -07:00
Treehugger Robot 1c1e258835 Merge "Fix ASAN + product_services" 2018-09-12 09:26:30 +00:00
Dan Willemsen 88e674e9a9 Merge "Always define apps_only"
am: 5d0be238d1

Change-Id: I07acd65b00622f0286c4a9d641cca7d265f5aadb
2018-09-12 01:47:58 -07:00
Treehugger Robot 5d0be238d1 Merge "Always define apps_only" 2018-09-12 08:36:13 +00:00
Neil Fuller 7229817457 Move signapk to a dedicated "host" target
Migrate off of one target onto another that should be identical.
"conscrypt" is about to be refactored for on-device use and signapk
needs to be unaffected.

Bug: 113148576
Test: make checkbuild
Change-Id: I3cecb4cc8fb8349383a82c8e430c936651e0835a
2018-09-12 08:19:49 +01:00
Dan Willemsen 60b7296d42 Fix ASAN + product_services
Test: SANITIZE_TARGET=address m nothing
Change-Id: I9724169b4cf474b4c963d33263ba52ebfff6efff
2018-09-11 23:11:07 -07:00
Dan Willemsen 5c43a6925a Always define apps_only
Allows dist-for-goals entries to use always use apps_only, without
having to conditionalize on TARGET_BUILD_APPS, or cause errors on full
platform builds.

Test: EMMA_INSTRUMENT=true m dist
Change-Id: Id484ad2a650b8ad49880469f195080ef7fa8c814
2018-09-11 22:47:45 -07:00
Jiyong Park a52b6e9ba8 fix: linktype for recovery modules in ASAN build is native:platform
When ASAN is on, recovery modules are instaled to
$(OUT_DIR)/target/product/.../data/asan/recovery/root. However, since
this is not under $(TARGET_RECOVERY_OUT), their linktype is incorrectly
determined as native:platform, instead of native:recovery.

To fix this, use get_non_asan_path to have consistent paths when
determining the linktype.

Bug: 115361480
Test: m -j; SANITIZE_TARGET=address m -j

Change-Id: I75edb1fe193d8a1a8099d4f5cf498910ca868d38
2018-09-12 10:05:58 +09:00
Colin Cross e8fe5c9162 Merge "Add soong_cc_prebuilt.mk"
am: 32de5bae88

Change-Id: I50a771621c801090eb9d487e567133f77713d8ca
2018-09-11 15:00:51 -07:00
Colin Cross 32de5bae88 Merge "Add soong_cc_prebuilt.mk" 2018-09-11 21:51:25 +00:00
Tao Bao 36703593c3 Merge "Expose libminui related variables as vendor default properties."
am: aff024ab6e

Change-Id: I5831ccb9b3839768c04a8eb0a051cfc4c0a5454d
2018-09-11 14:48:07 -07:00
Tao Bao aff024ab6e Merge "Expose libminui related variables as vendor default properties." 2018-09-11 21:33:01 +00:00
Tao Bao 9734fa966d Merge "Support building chained VBMeta images."
am: 92cc5d2ebe

Change-Id: I5d19d41c7f3cd7c6ea018ad87676a6e7c3a333c9
2018-09-11 13:07:13 -07:00
Tao Bao 92cc5d2ebe Merge "Support building chained VBMeta images." 2018-09-11 18:27:37 +00:00
Bowgo Tsai afb8caeadc Merge "Fix build error for sdk_gphone_x86_64-userdebug"
am: 8596dd8828

Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
2018-09-11 07:42:22 -07:00
Treehugger Robot 8596dd8828 Merge "Fix build error for sdk_gphone_x86_64-userdebug" 2018-09-11 14:33:21 +00:00
Bowgo Tsai 6924b25729 Fix build error for sdk_gphone_x86_64-userdebug
Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix
the build break. This is because we enabled AVB signing in the following
CL. And verified boot metadata will consume the reserved size in current
build system.

  https://android-review.googlesource.com/c/platform/build/+/745691

Bug: None
Test: build sdk_gphone_x86_64-userdebug
Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
2018-09-11 19:23:14 +08:00
Bowgo Tsai 84452c6876 Merge "Enable AVB signing on GSI"
am: d9a58852bd

Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
2018-09-10 23:37:17 -07:00
Treehugger Robot d9a58852bd Merge "Enable AVB signing on GSI" 2018-09-11 06:21:21 +00:00
Dan Willemsen 127e2da2d3 Merge "Mark more sdk targets as PHONY"
am: 88207d0d65

Change-Id: Ia1b5757f64583f4763a939c80951cf792a5d5071
2018-09-10 18:57:49 -07:00