tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
86649 commits 1 branch 0 tags 119 MiB
Commit graph

33802 commits

Author SHA1 Message Date
Treehugger Robot
5bd32b231f Merge "Create otatools build target with dist" am: a4721a5e6b am: 88b9b11bf8 am: 7cc1967008 
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235

Change-Id: I6e49941a91a9a2c0481ead0d5d30c614358efe74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:56:54 +00:00
Treehugger Robot
7cc1967008 Merge "Create otatools build target with dist" am: a4721a5e6b am: 88b9b11bf8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235

Change-Id: I79167fb274075801ea2717a87fb5f718d67c2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:23:24 +00:00
Treehugger Robot
a4721a5e6b Merge "Create otatools build target with dist" 2023-03-31 01:12:45 +00:00
Dennis Shen
5acfb9c4c6 Create otatools build target with dist 
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
 2023-03-30 20:10:17 +00:00
Paul Duffin
3490f88416 Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7 am: ac6008302e am: f54ad07923 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775

Change-Id: I2b561a2d09d055b9a8641bc2fe5dbb4604716e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:32:19 +00:00
Jared Duke
2efa9ddbfc Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a am: 8cc53f284e am: fccb79eba9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958

Change-Id: I8e6971e7e615a8dbabd8df777e43273a506e6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:01:38 +00:00
Paul Duffin
f54ad07923 Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7 am: ac6008302e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775

Change-Id: I4266087353d2c23f5a6fb7d95c52252b1ec76ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:44:07 +00:00
Dan Albert
9b507330eb Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e am: 39bca0748a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758

Change-Id: Icb775a6ab8cc08bc2e495c6cc86c87297e8986a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:43:09 +00:00
Dan Albert
bd6fc3785f Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88 am: 31c62f4c44 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: I15ea9fa745a8253ba9e18a105c57bf45fc7a23df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:43:06 +00:00
Treehugger Robot
188fdcd405 Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b am: 1045e6e398 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: I5709d6e7acce11251c3528a968892772126365a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:42:35 +00:00
Jared Duke
fccb79eba9 Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a am: 8cc53f284e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958

Change-Id: Ib3d6e18170ace3bfc66fa1e114800a1b853bb13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:39:30 +00:00
Dan Albert
39bca0748a Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758

Change-Id: Iaf7c7589c30d576f4e48b74243291eadeb96bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:37:03 +00:00
Dan Albert
31c62f4c44 Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: I0e0d48d699ef4d43ba78c576010436debc787162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:37:01 +00:00
Treehugger Robot
1045e6e398 Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:34:11 +00:00
Dan Albert
a2308ffc88 Acknowledge V in AOSP. am: 2549214184 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: Ic239277f7551ed8a8912a64c0fa8693db4cb2e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:13:19 +00:00
Wei Li
e79bf6523b Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621 am: 5dbbfc4981 am: 3e8a856df0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315

Change-Id: Ic9cd1347661ff888eacd65438da1a5bcc093bfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:41:16 +00:00
Paul Duffin
31860f66c7 Merge "Prevent enabling prebuilts by default for builds that don't support them" 2023-03-30 15:29:35 +00:00
Jared Duke
f43f66335a Merge "Keep methods annotated with @JavascriptInterface" 2023-03-29 22:24:00 +00:00
Dan Albert
249bc4c034 Merge changes from topic "fix-api_levels.json" 
* changes:
  Separate active codenames and preview codenames.
  Acknowledge V in AOSP.
 2023-03-29 17:57:22 +00:00
Treehugger Robot
d67a345f9a Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" 2023-03-29 17:04:37 +00:00
Wei Li
3e8a856df0 Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621 am: 5dbbfc4981 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315

Change-Id: I0da8ef640c143a06b87f52aafb9faf560523f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 16:55:32 +00:00
Dario Freni
92345a1cdb Prevent enabling prebuilts by default for builds that don't support them 
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7b5e2c0cea30dd084536bdc68dffdfb1c50073d)

This uses a completely separate Change-Id as the previous change was
applied to lots of downstream branches (so they contain the Change-Id
as far as the automerger is concernd) but the change got discarded due
to some merge issues. Using the previous Change-Id would cause
confusion. The title of this change was also updated as the previous
title only made sense within the larger topic to which it belonged.

Bug: 230478310
Bug: 223592962
Test: presubmit
Change-Id: Ie35ff34f4626070d1a3fe0bb3a6a999a596d0078
 2023-03-29 17:11:50 +01:00
Wei Li
936ae9add6 Remove unused make variable BUILDING_PVMFW_IMAGE 
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
 2023-03-29 07:29:54 +00:00
Treehugger Robot
0ff2c84265 Merge "remove reference to old VTS config" am: f0889e28b6 am: 8d1eb1aa3e am: 0a796f6fae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676

Change-Id: Iee82914888695ed5478967862f872d32c0a2ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 03:53:13 +00:00
Treehugger Robot
0a796f6fae Merge "remove reference to old VTS config" am: f0889e28b6 am: 8d1eb1aa3e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676

Change-Id: I21b936bcabfc8551fdcd85d126a1c84b4f47d77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 03:24:59 +00:00
Treehugger Robot
f0889e28b6 Merge "remove reference to old VTS config" 2023-03-29 02:23:10 +00:00
Dan Albert
2549214184 Acknowledge V in AOSP. 
Development of V APIs has started, so we need to add the codename to
the build system so API developers can use it.

Bug: None
Test: treehugger
Change-Id: Ic7e77cbc9992d7a0d2959abc42ce2862232317ca
 2023-03-28 23:25:45 +00:00
Dan Albert
4d24cbd044 Separate active codenames and preview codenames. 
Using PLATFORM_VERSION_ALL_CODENAMES (which is a bad name for
historical reasons) for discovering preview API levels doesn't work in
the narrow window where the branch's development is not for the latest
release. Create a second variable for preview codenames and expose it
to soong.

Bug: None
Test: None
Change-Id: I8c271c1d646ea8285553614c6bca944227a0e643
 2023-03-28 23:25:45 +00:00
Jared Duke
cc28b02f77 Keep methods annotated with @JavascriptInterface 
This rule is a common default rule elsewhere, and should be applied
globally for platform targets rather than relying on per-target rules.

Follow-up work will remove duplicated rules from individual targets.

Bug: 248580093
Test: m
Change-Id: If3cb9fb22d2acf90d87f150f93ad491549bf9090
 2023-03-28 14:14:56 -07:00
Ulya Trofimovich
cc5c6a74ee Revert "Disable dexpreopt for aosp_riscv64" 
This reverts commit ae7f543b7c.

Reason for revert: Enabling dexpreopt for RISC-V (there is still no
  compiler support, but dex2oat runs in verification mode and does
  not attempt any compilation with https://r.android.com/2510739).

Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
 2023-03-28 13:15:35 +00:00
Zhi Dou
1658acefc6 Merge "New product config flag to gate blueprint modules" into tm-qpr-dev 2023-03-28 13:12:35 +00:00
Sam Delmerico
4c3b83fe70 add PRODUCT_SOURCE_ROOT_DIRS product variable 
Change-Id: I31590eb133511a5dbdb8d6fe436cf511d1a160a2
 2023-03-27 14:40:50 -04:00
Treehugger Robot
80d1b21af4 Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51 am: 95f3ebf3cf am: e5d89d51e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191

Change-Id: I19e91290065cc2d884c966d774ec2c922b99eeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-25 02:16:51 +00:00
Treehugger Robot
e5d89d51e6 Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51 am: 95f3ebf3cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191

Change-Id: I04128e235dd8700783f3797f0eaa58f75f2ebb6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-25 01:45:53 +00:00
Peter Collingbourne
fd95f097fe Make kernel prebuilts writable after copying them. 
Images created by Bazel are read-only, which leads to build failures when
later commands attempt to modify them, as the cp command will also copy
the file permissions. Fix it by using chmod to make the images writable
after copying them.

Change-Id: I8aaa7c4395d38b674f76a7f0ebfa95e1f2da0af0
 2023-03-24 16:39:17 -07:00
Bob Badour
0bd9a626bd Increase dump-words-to-file capacity 
Test: m droid dsit
Change-Id: I092e032a8d8f943dbb2eddd4bb7c57df40bbcfba
 2023-03-24 13:12:45 -07:00
Colin Cross
7d9504703a Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 am: 99a26d0bfd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: Iab99c4cbf551f50882504d2df462e124aa76bda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 17:44:18 +00:00
Colin Cross
db6e20d916 Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07 am: 9ee11cef7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: Icf3be9c7c7b6fb6ba0187a023f4750813250497e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 17:41:03 +00:00
Colin Cross
99a26d0bfd Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: I6bb66b00b8344dafcea5825de2e5a65463d186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:55:11 +00:00
Colin Cross
9ee11cef7c Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: I64b731d3f4dc1041c016ec8d460856227bd41e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:54:27 +00:00
Colin Cross
2feb102e4d Merge "Don't read test mapping list in Make" 2023-03-24 15:53:47 +00:00
Colin Cross
ffda9a5093 Merge changes Id8b48c8c,I3b66304c 
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
 2023-03-24 15:48:32 +00:00
Colin Cross
01475b41fb Don't read test mapping list in Make 
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed.  Pass the file
to the rule and read it during ninja instead.

Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
 2023-03-24 04:33:07 +00:00
Sijie Chen
d33ef7391f Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee am: 74aebc8e55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I5333141e7effa06f75bdda0f7b13d1c275020147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 00:24:21 +00:00
Sijie Chen
74aebc8e55 Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I9e3fdfb1071c065c39f118ceedf17d80457a1909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 23:54:21 +00:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64 
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
 2023-03-23 16:29:28 -07:00
Sijie Chen
539fbc287e Merge "Clean additional Robolectric variable" 2023-03-23 22:51:42 +00:00
Spandan Das
8a02633b56 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a am: 11fbf45243 
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I62e58698f9a9fd511b1f69df5ae019f16976a1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 22:51:11 +00:00
Spandan Das
11fbf45243 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I7f050b963936c74b6a6a3469bad084b04de7479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 22:20:28 +00:00
Spandan Das
0326e64c3c Merge "Update hardcoded references to android_*stubs_current" 2023-03-23 21:32:03 +00:00
Sunil Ravi
4e19fe52ff Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f am: 40167b0380 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: Ib68ba885763bf62ead5604e3605b58ed66337d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 21:29:44 +00:00
Sunil Ravi
40167b0380 Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: I4007ed1a4c988f28f58dc7bd2899b9aa32b65b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 20:55:45 +00:00
Steven Moreland
aa81ee2a6e remove reference to old VTS config 
No longer exists, no longer used.

Bug: 274790216
Test: N/A
Change-Id: Id11921707cd5141235850d88a6d2397e85726532
 2023-03-22 21:11:42 +00:00
Ye Jiao
0786af077c Add config to skip state toggle off/on for Wi-Fi NAN 
If STA and NAN share the same iface wlan0, Wi-Fi vendor HAL service
sends eventDisabled to NAN framework when STA setMacAddress to wlan0.
This disables NAN when STA is turned on.

Since NAN always uses its own random MAC instead of using MAC of STA,
this action is not necessary and gets NAN kicked off for no benefits.

We add a build time configuration to optionally disable this behavior.

Bug: 273426515
Test: manually test

Change-Id: If0d84b3898387b75392c8012640bc728126f2cff
 2023-03-22 20:05:41 +00:00
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:48:26 +00:00
Julien Desprez
660e9fa2e3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:11:39 +00:00
Julien Desprez
f4c157e4cf Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 6bc1b2deed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I63a0d26d524d005f5d3fa91d8d457950bef86c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:48:06 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:57 +00:00
Julien Desprez
6bc1b2deed Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I1fd20f11bb37a544fb19558d4cbf77571a0bd899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:17 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:33:44 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:58:49 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev 
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
 2023-03-22 00:32:22 +00:00
Treehugger Robot
0db017be76 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff am: c02e0f7ad8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I17e60bc7c1afcff45c03059fcdc054422d5c56b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:25:25 +00:00
Nicolas Geoffray
02844ff77b Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a am: 5325cd5cdf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: I8580a642c577b1f4c0f012ec967f5f60e19d178c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:23:29 +00:00
Treehugger Robot
c02e0f7ad8 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:48:18 +00:00
Treehugger Robot
d7600be9a6 Merge "Disable system_server.zip generation for ART prebuilts" 2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36 Merge "Use the boot image mainline extension when dexpreopting in Make." 2023-03-21 14:51:20 +00:00
Pranav Gupta
1da7219ed1 Disable system_server.zip generation for ART prebuilts 
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false

Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
 2023-03-21 07:30:37 +00:00
Treehugger Robot
c39ca1406d Merge "Remove vtsc host tool" am: 896e7c715e am: d0362d7b16 am: 75c71733ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: I2de4252e46022157e44773294fca721747307e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 04:57:11 +00:00
Treehugger Robot
75c71733ef Merge "Remove vtsc host tool" am: 896e7c715e am: d0362d7b16 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: Ic52c0427a575f1c37f8f5b89c0209ac16b736012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 03:57:38 +00:00
Treehugger Robot
896e7c715e Merge "Remove vtsc host tool" 2023-03-21 02:14:34 +00:00
Spandan Das
0c01c90544 Update hardcoded references to android_*stubs_current 
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.

Test: TH
Test: No change in out/build-<lunch_product>.ninja

Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
 2023-03-20 21:59:18 +00:00
Cole Faust
e08325fb55 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57 am: 299878fb17 am: bfbb7718c7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: I66d57643ba132b420edf9725d9b4bd36457f692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:52:52 +00:00
Treehugger Robot
3c79e80233 Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41 am: 708b70a554 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575

Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57 am: 299878fb17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:14:47 +00:00
Treehugger Robot
5f3ddd4f41 Merge "Add rkpd to the list of individually toggleable modules" 2023-03-20 20:41:51 +00:00
Cole Faust
14108b6a57 Merge "Create image apexes by default instead of flattened apexes" 2023-03-20 19:54:49 +00:00
Treehugger Robot
76394be62a Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f am: d90bc8e5ee am: 96a1cfe673 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: If650e824bbf7f7446e3c4b922dd8a471d3a8e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:47:23 +00:00
Treehugger Robot
96a1cfe673 Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f am: d90bc8e5ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:02:32 +00:00
Jiakai Zhang
fb2734e36b Use the boot image mainline extension when dexpreopting in Make. 
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.

Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
  out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
  on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
 2023-03-20 18:42:13 +00:00
Cole Faust
5e2491eff2 Create image apexes by default instead of flattened apexes 
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ

Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.

Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
 2023-03-20 18:39:22 +00:00
Treehugger Robot
6dcf429d8f Merge "[config] Boards can supply custom super image script" 2023-03-20 17:52:41 +00:00
Paul Duffin
a537224b3a Add rkpd to the list of individually toggleable modules 
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.

Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
      m MODULE_BUILD_FROM_SOURCE=true droid
      m MODULE_BUILD_FROM_SOURCE=false droid
      # Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f)
 2023-03-20 16:21:23 +00:00
Paul Duffin
d82796bbf8 Merge "Add rkpd to the list of individually toggleable modules" into udc-dev 2023-03-20 16:13:18 +00:00
Ziwei Zhang
34a9f9c13e Merge "Add python mobly test template xml." am: 0a25e67404 am: 863bf01391 am: 31337205d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: I8a7a54ca25114c61782aac8e7c4f6ea8597ff925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 04:08:05 +00:00
Ziwei Zhang
31337205d6 Merge "Add python mobly test template xml." am: 0a25e67404 am: 863bf01391 
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 03:28:46 +00:00
Ziwei Zhang
0a25e67404 Merge "Add python mobly test template xml." 2023-03-20 02:16:04 +00:00
Ludvig Hansson
6d11991f1d Clean additional Robolectric variable 
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.

This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.

This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.

Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
 2023-03-17 23:55:29 +00:00
Paul Duffin
95b546475f Add rkpd to the list of individually toggleable modules 
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.

Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
      m MODULE_BUILD_FROM_SOURCE=true droid
      m MODULE_BUILD_FROM_SOURCE=false droid
      # Make sure that they build from sources and prebuilts respectively.
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
 2023-03-17 22:26:54 +00:00
Aidan Wolter
fbf53522cf [config] Boards can supply custom super image script 
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).

Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
 2023-03-17 20:17:35 +00:00
Steven Moreland
d733e64b9f Remove vtsc host tool 
We haven't used this in years.

Bug: N/A
Test: N/A
Change-Id: If79b05d75ca358b110c2e1723f1dd7f522e13f12
 2023-03-17 18:10:31 +00:00
Treehugger Robot
dc1652c955 Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4 am: 01321a6bb2 am: cdbc794cd9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665

Change-Id: Iaa151c740697ab6e041a8980dcc1a9266fb5ef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:37:26 +00:00
Treehugger Robot
cdbc794cd9 Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4 am: 01321a6bb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665

Change-Id: I498a9489ef3332f29aba7ffe641103185efa234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:58:38 +00:00
Treehugger Robot
d2b9ad4eb4 Merge "Disable riscv64 dependency on bcc and ld.mc" 2023-03-16 19:39:00 +00:00
Spandan Das
251205d866 New product config flag to gate blueprint modules 
Bug: 270654958

Example usage:
PRODUCT_INCLUDE_TAGS += use_myspecial_sdk

This also populates the allowlist with go/nogo mainline tags. Usage of
`PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error
in product config

Test: TH

Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
Merged-In: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
(cherry picked from commit 055e5f89a7bc5d12877fc6bc8110c1e1e8b6ee59)
 2023-03-15 22:15:30 +00:00
Wei Li
3cc80290c6 Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a am: 0f06273190 am: 90217d9c4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: I1f3f461e3311b8538431c95134c369f6ffa3cdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:03:42 +00:00
Wei Li
90217d9c4c Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a am: 0f06273190 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: Ibdca45c0e2c871c9a7f4c26bfa5d18d825112c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 06:27:44 +00:00
Wei Li
15187b6f1a Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." 2023-03-15 05:20:44 +00:00
Wei Li
499333616c Generate SBOM of the target product in file sbom.spdx.json in product out directory. 
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".

The feature will be enabled later in small CLs after running tests successfully in forrest.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
 2023-03-14 15:14:06 -07:00
Xin Li
eb2ad4b002 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:46 +00:00
Steve Berbary
2c4dad8ca3 Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:23:46 +00:00
Steve Berbary
07c703d53d Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:44:19 +00:00
Treehugger Robot
c189bbce54 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c am: f63e3bcc68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:28:11 +00:00
Steve Berbary
eaaa30b619 Update Security String to 2023-05-01 am: 6a3344db86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:09:15 +00:00
Treehugger Robot
f63e3bcc68 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6 Merge "add make_erofs to otatools to support erofs apex" 2023-03-14 15:47:05 +00:00
Steve Berbary
fa8a0ea9ef Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I0428ed3835e0c0f151569654133ae406ab5f3c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 04:38:34 +00:00
Steve Berbary
877ca9f537 Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e Update Security String to 2023-05-01 am: 2130534b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 03:50:29 +00:00
Steve Berbary
72e9b8675e Update Security String to 2023-05-05 am: be772485c3 am: 072f723276 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 01:58:16 +00:00
Steve Berbary
072f723276 Update Security String to 2023-05-05 am: be772485c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 01:17:35 +00:00
Kevin Han
21f3289c94 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b am: db4eccb0b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I59fe77902d69477667e0f6165549a58297c59f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:56:18 +00:00
Kevin Han
db4eccb0b2 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: Icda5099833a520be40518aad9fd61d962e4e0707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:03:01 +00:00
Kevin Han
a27f3cef8b Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I6a2405ac28898643a070616d7da3d5f49df9a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 21:28:45 +00:00
Kevin Han
afb2495f6f Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-13 21:03:22 +00:00
Kevin Han
161d711d4d Revert "Generate SBOM of the target product in file sbom.spdx in..." 
Revert submission 2481062-sbom

Reason for revert: b/273332655

Reverted changes: /q/submissionid:2481062-sbom

Change-Id: Ie8a73d8dc50592204acd489482e0e9d96ffbd5df
 2023-03-13 20:57:37 +00:00
Treehugger Robot
20d6e731bb Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735 am: 21eadd9e7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: Ifd807dbccb3346b79b6b69d2c02478121f25f8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:02:16 +00:00
Wei Li
d6fba2a779 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 am: 1f2ba11661 am: 4534fbc056 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: Ida57382107218ac24e4465dd10888eec738d364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:19 +00:00
Treehugger Robot
21eadd9e7a Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:07:09 +00:00
Wei Li
4534fbc056 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 am: 1f2ba11661 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: Ied7c1b2f563a957ba73b7d076311caf22db80853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:06:00 +00:00
Treehugger Robot
50aeb8e735 Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: I2a6d4a7a9018fbbd580088ed16efc6c8cee80c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:35:20 +00:00
Wei Li
1f2ba11661 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: I3410bc5aef8a08df8c707733d4f2addd61087868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:33:30 +00:00
Treehugger Robot
909a5b40a6 Merge "Update art-host-tests build rule to support partial download" 2023-03-13 17:54:01 +00:00
Roberto Gil Del Sol
26aa1b5efb Revert "Bump SDK Extension version to 6" am: 44f6963cb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21982904

Change-Id: I02015578609fa3bc3f3a59670a84ded97acc98da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:53:31 +00:00
Wei Li
27d32b0957 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-13 17:43:59 +00:00
Wei Li
88ac7ae7df Generate SBOM of the target product in file sbom.spdx in product out directory. 
Original aosp/2374663 was reverted, try to submit it again with some fixes in this.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: Icf305770473f0c448a1ad721cbe7addf737115e4
 2023-03-13 17:38:04 +00:00
Roberto Gil Del Sol
44f6963cb0 Revert "Bump SDK Extension version to 6" 
This reverts commit b3b72e8910.

Reason for revert: Due to lack of testing extServices needs to deboard M-05 train and sdk finalization needs to be reverted

Change-Id: I278a499b5c30f13617c134ce27a43a8ffa32e099
 2023-03-13 08:33:02 +00:00
Cole Faust
c35935c344 Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5 am: dc6b660798 am: 25b05a358a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535

Change-Id: Id46c411a3af6739e88c8b04104b91a2c054dcc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 03:02:16 +00:00
Steve Berbary
6a3344db86 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:52:03 +00:00
Steve Berbary
2130534b73 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:50:50 +00:00
Steve Berbary
be772485c3 Update Security String to 2023-05-05 
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:47:39 +00:00
Cole Faust
25b05a358a Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5 am: dc6b660798 
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535

Change-Id: I22ecf4fe4b04e75c69777e5792acfbefbfaa14c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:53:44 +00:00
Cole Faust
dc6b660798 Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535

Change-Id: I888ca82ce426ce147d44341ea1137dafe904de8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:13:01 +00:00
Cole Faust
a5511ea91a Don't install jni libs for uninstallable modules 
Bug: 254205429
Test: Presubmits
Change-Id: I6eec24f17bfeac0179558356e07a13dfb071a2bb
 2023-03-10 12:30:12 -08:00
Iván Budnik
e89ee37806 Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab am: 4b17107fe3 am: 9e3c1085a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I8c6ad275ea706add5244821f5849252cef7f59ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:17:23 +00:00
Iván Budnik
9e3c1085a5 Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab am: 4b17107fe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I7b6fda015713093840a1d567f2b196620aab6cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:23:18 +00:00
Iván Budnik
4b17107fe3 Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I181241288de1c5e261f01c8acee1ea7cd179fd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:47:30 +00:00
Iván Budnik
1c117c5fab Merge "Revert "Don't install jni libs for uninstallable modules"" 2023-03-10 16:30:32 +00:00
Iván Budnik
4616ec7eb7 Revert "Don't install jni libs for uninstallable modules" 
Revert submission 2462194-androidmk_for_apex_dependencies

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333.

Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies

Bug: 272663333
Change-Id: Iecf99713133b2bc8f35614b6b9596422dc051198
 2023-03-10 16:11:31 +00:00
Wei Li
3ce3f29f3d Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 am: edd91aa259 am: 6f57b6d309 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I24bb03108b69c00fe3c494b26ceccf34006c8411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:50 +00:00
Cole Faust
f6476d2794 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 am: 474f5f2742 am: 21f795206c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: Id3ea7da13d7353a3c451aba770cdb583ae2a70a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:31 +00:00
Cole Faust
e74e2aed2a Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef am: ce3615c9e3 am: cef47562bb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: Idc926346cbccd35b7550334e2ce19d7b532394c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:13 +00:00
Wei Li
6f57b6d309 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 am: edd91aa259 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I28f794c3a1686de5bc2fe56cb003dd2a3618cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:40 +00:00
Cole Faust
21f795206c Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 am: 474f5f2742 
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: I3ddf464fe4bdf49fbfe0c3d81a9aaa882985a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:19 +00:00
Cole Faust
cef47562bb Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef am: ce3615c9e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: I05805331aad4a13084c67b8305233305336a300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:27:58 +00:00
Wei Li
edd91aa259 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I868b8af6c1086473712073c33dd529129e4cc955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:33 +00:00
Cole Faust
474f5f2742 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: I106a75087660ace09f0ae658d1d2fc9893795fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:02 +00:00
Cole Faust
ce3615c9e3 Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: Ifdb261e2f296b89743aa50a5a7c9073028006c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:03:35 +00:00