Commit Graph

77976 Commits

Author SHA1 Message Date
Liz Kammer
bcf8507f10 Merge "Handle java_resources as deps" into main am: b5c3b018d9 am: cd432e7a93 am: 1f92c64dcd am: ee6238a919 am: f6f9e4ddbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: If01f285e1b7c79f216f2850ed7f274e4ca8cc741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 23:53:29 +00:00
Liz Kammer
f6f9e4ddbd Merge "Handle java_resources as deps" into main am: b5c3b018d9 am: cd432e7a93 am: 1f92c64dcd am: ee6238a919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: Idf187ee4865b9fd938c06ba0763b9428814302df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 23:22:01 +00:00
Liz Kammer
ee6238a919 Merge "Handle java_resources as deps" into main am: b5c3b018d9 am: cd432e7a93 am: 1f92c64dcd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: Id4f01ee5fd5c00c4a008e0592132b8a0c7814480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 22:48:40 +00:00
Liz Kammer
cedc77e022 Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 am: b29d829e6b am: 91d416a75c am: 61d7def32b am: 57b0309d6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: Ia44bd2b671647f1da5a8b10abb2892e932615501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 22:31:15 +00:00
Liz Kammer
1f92c64dcd Merge "Handle java_resources as deps" into main am: b5c3b018d9 am: cd432e7a93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: I0a25be6a79d438ea0203c550b7c5864e5fb58574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 22:15:53 +00:00
Liz Kammer
57b0309d6b Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 am: b29d829e6b am: 91d416a75c am: 61d7def32b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I1c4787176e4f8f8f5de4c9022ab93ca1abe54298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 21:57:52 +00:00
Liz Kammer
cd432e7a93 Merge "Handle java_resources as deps" into main am: b5c3b018d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: I8d16b122bc785a5cc2c1e34e4a326cd4198d7aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 21:41:35 +00:00
Liz Kammer
61d7def32b Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 am: b29d829e6b am: 91d416a75c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I9889092917e5eff47d39b62ad3cbeb6fa7390187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 21:25:11 +00:00
Liz Kammer
b5c3b018d9 Merge "Handle java_resources as deps" into main 2023-10-12 21:10:37 +00:00
Cole Faust
36b370ac6f Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 am: 871d783c17 am: a0bc781b00 am: 0332a21292 am: 6abe890deb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I53571ced2e82e383a6023dfddf87e2f709b43063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 21:06:48 +00:00
Liz Kammer
91d416a75c Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 am: b29d829e6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I3b0ad4803f43854502ba88d543767f2160d313e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 20:51:55 +00:00
Cole Faust
6abe890deb Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 am: 871d783c17 am: a0bc781b00 am: 0332a21292
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: Ie57e29016c59efc02e71233b6c5e9343b25bd0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 20:37:37 +00:00
Liz Kammer
b29d829e6b Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I8a7442b9c93d2888c0f4cf3c99ffd817a3cce305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 20:22:38 +00:00
Cole Faust
0332a21292 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 am: 871d783c17 am: a0bc781b00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I2003dcd6844d8f44f32cd69095bccc933d0f3f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 20:05:13 +00:00
Liz Kammer
c723757dd7 Merge "Change openjdk9 specific props in bp2build/Soong" into main 2023-10-12 19:47:38 +00:00
Jihoon Kang
d3126e840f Merge changes from topic "enable-hidden-api" into main am: e100a884e3 am: 632dd0ca85 am: b37ad3e3fc am: 16f880079f am: 5cf2e5acc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: Ia511926efa8980a84c442f3225eadb7f45e95d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:34:49 +00:00
Zi Wang
d78caf6436 Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 am: e2d26d0839 am: 114a1c9aec am: 92a245ad62 am: 9c01c23a0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: Ia0662df39b9ac53375139f9946062b7b66c524fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:32:18 +00:00
Cole Faust
5dedcd64f1 Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb am: e93a697a16 am: 168fbb38de am: 1db5abcda6 am: ffc4b3f6f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: Id014b8a7e6f0f125411f8bf8a503c9089806a2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:32:07 +00:00
Cole Faust
6e1068d792 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d am: 252d2fdb46 am: d5c3a5bd10 am: 81f8d77641 am: b36ca46dc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: I82872f209fe2db24ab3d286ceadfeb3003914908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:31:34 +00:00
Cole Faust
a0bc781b00 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 am: 871d783c17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I77ce30167b509bb774db6f5c5e0f8fd1568f9f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 19:31:19 +00:00
Jihoon Kang
5cf2e5acc0 Merge changes from topic "enable-hidden-api" into main am: e100a884e3 am: 632dd0ca85 am: b37ad3e3fc am: 16f880079f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I1a1402c838e33193fc19652c49d8ff0a0eb85fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:57:05 +00:00
Zi Wang
9c01c23a0b Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 am: e2d26d0839 am: 114a1c9aec am: 92a245ad62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: Iad2be9e59f4fabd1b1403bb3b867d5d130527ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:55:47 +00:00
Cole Faust
ffc4b3f6f2 Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb am: e93a697a16 am: 168fbb38de am: 1db5abcda6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: Ie174968910c41f3d2ba2463025c106dd4b4611ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:55:40 +00:00
Cole Faust
b36ca46dc1 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d am: 252d2fdb46 am: d5c3a5bd10 am: 81f8d77641
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: I011cb4315d02f08f80ac251445b46e7ab4f02bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:55:00 +00:00
Cole Faust
871d783c17 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I4cb283439c1e2b1ed35018f8d958c49d87ad56fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:54:55 +00:00
Jihoon Kang
16f880079f Merge changes from topic "enable-hidden-api" into main am: e100a884e3 am: 632dd0ca85 am: b37ad3e3fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I0173a419fef6ba26863791d57e393569724101b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:41:11 +00:00
Cole Faust
ad35c57288 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main 2023-10-12 18:30:56 +00:00
Jihoon Kang
b37ad3e3fc Merge changes from topic "enable-hidden-api" into main am: e100a884e3 am: 632dd0ca85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I18d6dd99fc3b0255c149b5345123fa6faffd784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:08:45 +00:00
Zi Wang
92a245ad62 Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 am: e2d26d0839 am: 114a1c9aec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: Iaa625564610d94b43ea0c89014c58f907f3385a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:08:40 +00:00
Cole Faust
1db5abcda6 Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb am: e93a697a16 am: 168fbb38de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: I1eef0f735824f69d62a0f632d46ed9e72cb1bd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:08:31 +00:00
Cole Faust
81f8d77641 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d am: 252d2fdb46 am: d5c3a5bd10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: Ifc87b4bf7c6ce80c4c9f914bba94af5fbfdbbd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 18:07:41 +00:00
Jihoon Kang
632dd0ca85 Merge changes from topic "enable-hidden-api" into main am: e100a884e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617274

Change-Id: I2840b6d745b8bd0e032c34dda364ac6378da9f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 17:38:48 +00:00
Zi Wang
114a1c9aec Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245 am: e2d26d0839
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: I5558dd6f7ec332e9baf125144aa083b618f6aeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 17:35:02 +00:00
Cole Faust
168fbb38de Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb am: e93a697a16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: Ifc36c3edfee5a558c45903c4ba5e7ebc49c2d350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 17:34:34 +00:00
Cole Faust
d5c3a5bd10 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d am: 252d2fdb46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: I954e7f09f0cc5892f46d56d3a9e403762d570267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 17:34:20 +00:00
Zi Wang
e2d26d0839 Merge "Support prebuilt_root_host in bp2build" into main am: 7c81b2b245
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782249

Change-Id: I6fc4d02643f2fed70661f4c42185824372d884d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 17:34:02 +00:00
Jihoon Kang
e100a884e3 Merge changes from topic "enable-hidden-api" into main
* changes:
  Enable hiddenapi check for from-text stub build
  Utilize module lib and test api superset module in hiddenapi
2023-10-12 17:33:35 +00:00
Zi Wang
7d54b3a5d8 Fix TestPrebuiltRootHostWithWildCardInSrc
Test: CI
Change-Id: Ia39ac3217fa827fec4c6e572e49c49c15e126109
2023-10-12 10:25:31 -07:00
Zi Wang
7c81b2b245 Merge "Support prebuilt_root_host in bp2build" into main 2023-10-12 17:10:21 +00:00
Cole Faust
e93a697a16 Merge "Denylist CompilationTestCases_package-dex-usage" into main am: 4e234c99fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786979

Change-Id: I4b9d14201b21705e49a479d6115da40563b0e09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 16:58:26 +00:00
Cole Faust
252d2fdb46 Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main am: 14645b284d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773848

Change-Id: Ib3863a3f127b9f698169884ba20fa75c441881f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 16:57:20 +00:00
Cole Faust
4e234c99fb Merge "Denylist CompilationTestCases_package-dex-usage" into main 2023-10-12 16:57:00 +00:00
Cole Faust
3af559c9ce Denylist CompilationTestCases_package-dex-usage
I'm not sure how this was missed earlier.

Bug: 290816499
Test: build/soong/tests/genrule_sandbox_test.py -t sdk_phone_x86_64 all with aosp/2666142
Change-Id: I8d21a34e3b13ac568fa6153a31c43ba3e4d516bd
2023-10-12 09:54:53 -07:00
Paul Duffin
f2b3d1021e [automerger skipped] Retain concrete overrides of abstract methods by default am: 97bcce7695 -s ours
am skip reason: Merged-In I3d9fafefe90a98568c16d80c30e4d1d88a22c350 with SHA-1 629b9d287d is already in history

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

Change-Id: I63a42eed6eac1d2c64e1fa4e374fe1aa51288121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 16:40:47 +00:00
Cole Faust
14645b284d Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main 2023-10-12 16:33:11 +00:00
Ivan Lozano
bbcb188c3c Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3 am: 1b5dad971a am: 1e09e06286 am: 2b8a8541ba am: b8c81f15f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547

Change-Id: I9af196909c0b0b0e49e54f061f7a51f0d0de1f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 15:35:35 +00:00
Ivan Lozano
b8c81f15f9 Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3 am: 1b5dad971a am: 1e09e06286 am: 2b8a8541ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547

Change-Id: Ic954ced22d099325c6370341425b41b9016ec6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 14:58:28 +00:00
Ivan Lozano
2b8a8541ba Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3 am: 1b5dad971a am: 1e09e06286
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547

Change-Id: I90dd149f5d8c2742df31a1148c804d6d05789b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 14:30:10 +00:00
Liz Kammer
93b7e9545e Handle java_resources as deps
Test: CI && unit tests
Change-Id: I51f3c7d876c3cc25cb0459d933e1a510cfb5bf13
2023-10-12 09:57:06 -04:00
Liz Kammer
9f52f6ba60 Change openjdk9 specific props in bp2build/Soong
JDK17 is the default java version, adding these props conditionally
openjdk9 is no longer relevant

Test: CI
Change-Id: I5d80fd22f474cedf389d1e295620cfc17bc327a0
2023-10-12 09:57:04 -04:00