p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
68,076 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

68076 Commits

Author SHA1 Message Date
Paul Duffin 2b90008ccd Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: If2bb9fa5cc433ebf24de26ecd98879e9e658422f
 2021-04-14 19:11:27 +00:00
Ivan Lozano 1e3771f9ed Merge "Add Rust vendor image support to Make." 2021-04-14 19:02:48 +00:00
Kelvin Zhang 6c17ed3185 Re-raise exceptions instead of sys.exit 
Test: th
Change-Id: I3ac343b51eeeaa948712be81b640122f9981137d
 2021-04-14 14:59:12 -04:00
Paul Duffin 55e6511331 Merge "Avoid adding jacocoagent to bootclasspath twice" 2021-04-14 18:27:59 +00:00
Mateusz Zięba 647bfb356a Fix bug: include all dirs not just the last one. 
Test: m all

Bug: 179023362

Change-Id: I5724f792ee36c2f66786761e5d55b4f6c456753c
Merged-in: I5724f792ee36c2f66786761e5d55b4f6c456753c
 2021-04-14 11:13:54 -07:00
Paul Duffin 2e046e6c61 Avoid adding jacocoagent to bootclasspath twice 
Previously:
* If EMMA_INSTRUMENT_FRAMEWORK=true then jacocoagent was
  added to the ART_APEX_JARS which itself is added to
  PRODUCT_BOOT_JARS.
* If EMMA_INSTRUMENT=true then it was added directly to the
  PRODUCT_BOOT_JARS.
* If both were true then it was added in both places ending up on the
  bootclasspath twice.

Bug: 185369704
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true droid
      m droid
Change-Id: Id1d4d1c98455cb2859ed5e4071a0cf14fb40eec4
 2021-04-14 17:50:48 +01:00
Bowgo Tsai c1bb0247fb Enable GKI 2.0 signing 
This is to check the interity of a generic boot.img.

Note: build/make/target/product/gsi/testkey_rsa2048.pem is generated by:
      `openssl genrsa -out testkey_rsa2048.pem 2048`.

Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I12ea4c666f71ad6b6c245d629e41904eb8d90858
 2021-04-14 23:26:14 +08:00
Jeffrey Vander Stoep bcc9be437c Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 am: f32b226103 
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: If769070a94cdf40e4f6520b95bf908c842436dbf
 2021-04-14 09:23:28 +00:00
Jeffrey Vander Stoep f32b226103 Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: I46d60fcb3b1da8a0ace18d7b7b7a2069234bad14
 2021-04-14 08:37:14 +00:00
Jeffrey Vander Stoep 4cce23d7d5 Merge "Add test configuration for rust benchmarks." 2021-04-14 08:02:46 +00:00
Bill Yi d56038b3cb [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 2f4c1cabf7 -s ours am: 5281dda7ee -s ours 
am skip reason: skip tag Change-Id I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1 with SHA-1 48216a8112 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1674947

Change-Id: I7c62976767abc8e386e70a2f5a286fef7359e036
 2021-04-14 06:31:21 +00:00
Bill Yi 5281dda7ee [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 2f4c1cabf7 -s ours 
am skip reason: skip tag Change-Id I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1 with SHA-1 48216a8112 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1674947

Change-Id: I4e73c0c3a6f048eb73122d8fe4e9b7f9748e545c
 2021-04-14 05:46:18 +00:00
Bill Yi 2f4c1cabf7 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:52 +00:00
Bill Yi 21e8c35b78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
Merged-In: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
Change-Id: Icdb6feab48152418ee3e3d44a6d039225a11dbbf
 2021-04-13 19:31:56 -07:00
Bob Badour c559216edd Merge "Fix bug: include all dirs not just the last one." am: f7e9c43464 am: 48216a8112 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673848

Change-Id: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
 2021-04-14 00:51:09 +00:00
Bill Yi b07ad40032 [automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: d8833cd80d -s ours 
am skip reason: skip tag Change-Id I1d84aef53b26c067707d16575fe0fa70f9aaaae2 with SHA-1 fbfd3e96ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14175386

Change-Id: I31846673e28af2af122a9bc112514dc812197796
 2021-04-14 00:31:11 +00:00
Daniel Norman 07811eac8a Merge changes Ic269fa99,I045be7cb am: 4b7ee39a70 am: ee9131fd93 
Original change: https://android-review.googlesource.com/c/platform/build/+/1672446

Change-Id: I0df537c571a08e440416d1ea92d669b339837407
 2021-04-14 00:30:28 +00:00
Treehugger Robot 7278588fc6 Merge "Remove grf_required_api_level" am: e58067f70d am: 8bfd75efb5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674409

Change-Id: Ic73065a45876b5233b113ec8f1c4688e58ed3366
 2021-04-14 00:30:22 +00:00
Bob Badour 48216a8112 Merge "Fix bug: include all dirs not just the last one." am: f7e9c43464 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673848

Change-Id: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
 2021-04-14 00:30:16 +00:00
Bill Yi d8833cd80d Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-04-14 00:27:04 +00:00
Bob Badour f7e9c43464 Merge "Fix bug: include all dirs not just the last one." 2021-04-14 00:16:12 +00:00
Daniel Norman ee9131fd93 Merge changes Ic269fa99,I045be7cb am: 4b7ee39a70 
Original change: https://android-review.googlesource.com/c/platform/build/+/1672446

Change-Id: I32d7b9a19b1708669471c3eb1f8b2395200bd95c
 2021-04-14 00:10:38 +00:00
Treehugger Robot 8bfd75efb5 Merge "Remove grf_required_api_level" am: e58067f70d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674409

Change-Id: I5a20f727b0103ab08c9f4512b63a32929b4d2cfa
 2021-04-14 00:09:57 +00:00
Daniel Norman 4b7ee39a70 Merge changes Ic269fa99,I045be7cb 
* changes:
  Generate care_map.pb when merging target files packages.
  Moves care map generation logic to common.py, so it can be reused.
 2021-04-13 23:54:08 +00:00
Treehugger Robot e58067f70d Merge "Remove grf_required_api_level" 2021-04-13 23:29:31 +00:00
Jaewoong Jung d3561eaef0 Add a missing dependency to the prebuilt app rule. 
Fixes: 185197439
Test: Manual test with the CLs cherry-picked.
Change-Id: I595d02497c6504d06239bf2e3562a5448b88b346
 2021-04-13 15:03:05 -07:00
Mateusz Zięba 5371607b50 Fix bug: include all dirs not just the last one. 
Test: m all

Change-Id: I5724f792ee36c2f66786761e5d55b4f6c456753c
 2021-04-13 13:14:13 -07:00
Daniel Norman db8cacc976 Generate care_map.pb when merging target files packages. 
Test: build a merged target using Forrest,
      Observe META/care_map.pb
Bug: 182296208
Change-Id: Ic269fa99ec8ed2bd474a2f69b1be1f545c567112
 2021-04-13 11:43:02 -07:00
Kelvin Zhang 2732413fa2 Moves care map generation logic to common.py, so it can be reused. 
Test: th
Bug: 182296208
Change-Id: I045be7cb208412431d6ab1c26e31d38d2285738b
 2021-04-13 11:42:26 -07:00
Paul Scovanner 7d063238d8 Update Security String to 2021-06-05 am: deaeaecae3 am: 307e58c439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Id6d3fb94d0a7ec24017601ad32e42ba16246219b
 2021-04-13 17:40:50 +00:00
Paul Scovanner 307e58c439 Update Security String to 2021-06-05 am: deaeaecae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Ia0f6f832cfc4e1cabc3d996159a682d911eee972
 2021-04-13 17:12:13 +00:00
Evgenii Stepanov 13bc227ef0 Fix evaluation order of (Cfi|Memtag) exclude paths. 
Before this change, exclude paths disabled sanitization of targets that
would otherwise be enabled by SanitizeDevice product variable (aka
SANITIZE_TARGET).

With this change, in addition to the above logic, exclude path disables
sanitization of targets that would otherwise be enabled by the
corresponding include path.

Effectively, this change disables sanitization of targets that are
covered by *both* include and exclude paths.

Test: MEMTAG_HEAP_SYNC_INCLUDE_PATHS=system/extras \
      MEMTAG_HEAP_EXCLUDE_PATHS=system/extras/su m su && \
      readelf -n path/to/su | grep .note.android.memtag
Bug: b/184976817
Change-Id: Ifa44b85556c6468fe5a37b5e6864c4ce9561ae2b
 2021-04-13 10:11:58 -07:00
Mitch Phillips 378b93caa0 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I63bc93527591b28b13189c5880f6c9097e21b4ce
 2021-04-13 16:27:14 +00:00
Ulyana Trafimovich 266ddfaf9a Merge "Don't expect all Java modules to have a manifest." am: 27db0284d0 am: 8b46006319 
Original change: https://android-review.googlesource.com/c/platform/build/+/1669905

Change-Id: I5d7389a581381235aa183ba9ab92f5c9d643f382
 2021-04-13 16:26:40 +00:00
Ulya Trafimovich affbaed3be Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES. 
No functional changes.

Bug: 132357300
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: Ia43ac9306c40df5bec525ae1b245add57f568ee5
 2021-04-13 17:26:28 +01:00
Mitch Phillips c007630a9a Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I0c0e697ee3a1c1db86ba2315d66dbb3dcb6c1a7d
 2021-04-13 15:49:15 +00:00
Ulyana Trafimovich 8b46006319 Merge "Don't expect all Java modules to have a manifest." am: 27db0284d0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1669905

Change-Id: I782b9118e2fc31269bc06bed997839d87bf298a1
 2021-04-13 15:42:35 +00:00
Mitch Phillips 002dd30e94 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." 2021-04-13 15:31:14 +00:00
Ulyana Trafimovich 27db0284d0 Merge "Don't expect all Java modules to have a manifest." 2021-04-13 15:16:37 +00:00
Yo Chiang d1131447db Merge "Support installing modules.options file" am: 7a8965c1fb am: a074c7db37 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: If8c2e67437e3008e177633a9cb3bce6d706d9c4b
 2021-04-13 13:22:43 +00:00
Yo Chiang a074c7db37 Merge "Support installing modules.options file" am: 7a8965c1fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: Idcbb839c290d9f0c44bec8778eb67bd1ff13dcc6
 2021-04-13 12:36:59 +00:00
Ulya Trafimovich 6ef5779c98 Don't expect all Java modules to have a manifest. 
Some libraries that go through manifest_check do not have a manifest or
APK, so there is nothing to check LOCAL_USES_LIBRARIES and
LOCAL_OPTIONAL_USES_LIBRARIES against. Handle it as if the manifest had
zero <uses-library> tags: don't fail the build unless the module has
non-empty LOCAL_USES_LIBRARIES or LOCAL_OPTIONAL_USES_LIBRARIES.

Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m
Change-Id: I4b1317cfbd93cb6129caba51b56081307a564442
 2021-04-13 12:42:44 +01:00
Yo Chiang 7a8965c1fb Merge "Support installing modules.options file" 2021-04-13 09:20:24 +00:00
Justin Yun 48aa78ed3c Remove grf_required_api_level 
As we don't fix the grf window, we may not calculate the grf
expiration date and the required api level.
The verification of this will be covered by the tests at run time.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: I1205f0d9a9da5bc508a49acbcbb7da581800bf45
 2021-04-13 17:58:59 +09:00
Yo Chiang e4b461d603 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737 am: c4da3f5332 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: I350e522461d61dbef3a2907367e9f1aee3aadd94
 2021-04-13 08:50:26 +00:00
Yo Chiang c4da3f5332 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: I8445ea0d23d17f1cfa4a54f1672766feafe6eb2f
 2021-04-13 08:03:59 +00:00
Yo Chiang dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +00:00
Martin Stjernholm f692c756f7 Add new user setup command banchan for module building. 
It currently uses TARGET_BUILD_APPS just like tapas, but the use case is
different and it may diverge more in the future.

Test: banchan com.android.art
Test: banchan help
Test: banchan
Test: hmm
Bug: 179779520
Change-Id: Iae718e65a2a7212c741c397e03c6f9a6d5ee8951
 2021-04-13 02:07:04 +01:00
Peter Collingbourne 9199e4c04d Merge "Only link the MTE notes against executables." am: ffa65ba8f0 am: 309b414c20 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I40edc800fa73b5338cd9570dfe81cc7a3e27d401
 2021-04-12 23:00:15 +00:00
Mitch Phillips 77e037c887 [MTE] [CFI] Fix CFI -> diag promotion with memtag_heap. 
Small typo in the AndroidMk sanitizer config, where adding heap MTE
ended up promoting CFI to diagnostic CFI accidentally, where this isn't
a valid transformation.

Bug: 184397138
Test: lunch aosp_sunfish-userdebug
Test: PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS=\
Test: "hardware/qcom frameworks/opt/net/wifi" \
Test: CFI_INCLUDE_PATHS=hardware/qcom \
Test: m libwifi-hal
Change-Id: I74a03debf0042f2ee004503dd4a0e81131bd9fde
 2021-04-12 15:35:47 -07:00