Colin Cross
e88d5b1796
Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78
am: a43251d771
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024
Change-Id: I65bda887d0343e4501bc09a66f1d9fb523130ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 19:14:24 +00:00
Colin Cross
a43251d771
Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024
Change-Id: If13a7adfb78ddf43cf1caea012930c47dd305ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 18:42:40 +00:00
Colin Cross
149f6f6f78
Merge "Put shared library R.jar files in the classpath" into main
2023-10-13 18:08:04 +00:00
Jingwen Chen
8086bbfdb4
Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c
am: 79526bd72f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179
Change-Id: If6f65eecfd40a47aca8c8a6221279e509e648170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 08:12:37 +00:00
Yike Zhang
17706aa7c0
Merge "Enable pyfakefs
in bp2build" into main am: 95a2901e52
am: d314e6ecbd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347
Change-Id: I481b799f385e5a00523731010cc16d0a601576e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 08:12:24 +00:00
Jingwen Chen
79526bd72f
Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179
Change-Id: I21ad1027ffc724a27062cc837c09d7979d86114c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 07:40:00 +00:00
Yike Zhang
d314e6ecbd
Merge "Enable pyfakefs
in bp2build" into main am: 95a2901e52
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347
Change-Id: Id5995e6db249c477c8c9fe3b9d07d7ceee0bcc16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 07:39:42 +00:00
Jingwen Chen
a51d0d7d5c
Merge "Allowlist mainline_modules_sdks_test" into main
2023-10-13 07:11:08 +00:00
Yike Zhang
95a2901e52
Merge "Enable pyfakefs
in bp2build" into main
2023-10-13 07:08:44 +00:00
Treehugger Robot
e105277cfb
Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9
am: 7c80f4eb32
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169
Change-Id: I03e35c3b72081326f5b1b309938eb3147bd2581c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 06:48:32 +00:00
Treehugger Robot
7c80f4eb32
Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169
Change-Id: I5ee3e32b97221564e74980458b044e7d5a9a7ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 06:16:30 +00:00
Treehugger Robot
d278e522f9
Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main
2023-10-13 05:32:55 +00:00
yike
bae0b4c761
Enable pyfakefs
in bp2build
...
`//tools/asuite/atest:java-test-filter-generator-test` requires this
dependency.
Test: presubmit
Bug: 301180123
Change-Id: I9ed0d1a89b34a985c671960546914c039e4e4556
2023-10-13 03:43:52 +00:00
Cole Faust
e842a6c874
Revert "Add out/partitions_were_clean_at_start_of_build.txt"
...
Revert submission 2773149-partition_file_list_check
Reason for revert: b/305103467, b/305103783, b/305103468
Reverted changes: /q/submissionid:2773149-partition_file_list_check
Change-Id: I4116fe908cc914f41dc1bf7e950acb32bc546995
2023-10-13 02:51:08 +00:00
Vinh Tran
ba19a4b2cc
Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb
am: 3ce3a959ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509
Change-Id: I6f4b8a92784d4b1d692f5c537554376ee5e64710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 00:10:58 +00:00
Vinh Tran
3ce3a959ce
Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509
Change-Id: I522de441b5952ef1b1c10eb3c21f34a364f8af4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 23:38:12 +00:00
Vinh Tran
47f0894ceb
Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main
2023-10-12 23:10:41 +00:00
Colin Cross
8676c8cba5
Put shared library R.jar files in the classpath
...
When building with use_resource_processor: true R.jar files from
shared andoid_library dependencies need to be added to the classpath
so that the generated R classes can be referenced.
Bug: 294256649
Test: m DocumentsUIPerfTests
Change-Id: I30a6bddc3f378ecf58f142f94049e67ba33a47e3
2023-10-12 16:01:04 -07: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
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
b5c3b018d9
Merge "Handle java_resources as deps" into main
2023-10-12 21:10:37 +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
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
Liz Kammer
c723757dd7
Merge "Change openjdk9 specific props in bp2build/Soong" into main
2023-10-12 19:47:38 +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
Vinh Tran
308096475b
Export rust flags for arm, x86, and x86_64 to Bazel
...
Test: b build //build/bazel/examples/rust:all --config=android
Bug: 295918553
Change-Id: I53d393f4cc5cd99ccd17d37e32211adaaba5bd0a
2023-10-12 14:59:50 -04: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
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
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
Cole Faust
14645b284d
Merge "Add out/partitions_were_clean_at_start_of_build.txt" into main
2023-10-12 16:33:11 +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
Ivan Lozano
1e09e06286
Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3
am: 1b5dad971a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547
Change-Id: Ie737963fcaf0b0883c0253fba7a9f904cecf4e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 13:55:05 +00:00
Ivan Lozano
1b5dad971a
Merge "rust: Temporarily disable ASAN builds for Host" into main am: 91738fddb3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784547
Change-Id: Ife9730263942475b5ab43f7162d96bcfacce8ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 13:22:23 +00:00
Ivan Lozano
91738fddb3
Merge "rust: Temporarily disable ASAN builds for Host" into main
2023-10-12 12:53:43 +00:00
Jingwen Chen
390d4ca325
Allowlist mainline_modules_sdks_test
...
Test: b build `bmod mainline_modules_sdks_test`
Change-Id: I1e2e0fdf8547e48b53a96c42d492da861007b10c
2023-10-12 10:00:55 +00:00
Ian Zerny
be0874053a
Merge "Ignore dex files in input archives" into main am: 57beac1b76
am: 44c234ecf1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2780987
Change-Id: I7408144c078f2eef7729bd53128e8e9b35104109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 07:33:23 +00:00
Ian Zerny
44c234ecf1
Merge "Ignore dex files in input archives" into main am: 57beac1b76
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2780987
Change-Id: I03ed4ba47e88a1e62ac2a348635dd7a11ee3f7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 07:00:51 +00:00