Commit Graph

78011 Commits

Author SHA1 Message Date
Colin Cross
e331433dd9 Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78 am: a43251d771 am: e88d5b1796 am: 0abb9e863b am: f4578a4787
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024

Change-Id: I22929b25c07d531d71ae9d077129b4d0a21341ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 20:53:38 +00:00
Colin Cross
f4578a4787 Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78 am: a43251d771 am: e88d5b1796 am: 0abb9e863b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024

Change-Id: I127c579d908b08cf5e868c8a8659061208a90bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 20:20:25 +00:00
Colin Cross
0abb9e863b Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78 am: a43251d771 am: e88d5b1796
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024

Change-Id: I93731b79b0d92e5cbe2f621a990da878cc80661a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 19:47:27 +00:00
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
f014d9233b Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c am: 79526bd72f am: 8086bbfdb4 am: c5d8845d2d am: dc1231250e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179

Change-Id: Icc82ec68892604fe16786ad12014b5309af45a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 09:50:26 +00:00
Yike Zhang
41e91bcd4e Merge "Enable pyfakefs in bp2build" into main am: 95a2901e52 am: d314e6ecbd am: 17706aa7c0 am: 3731a66b5d am: 6b19c2ee3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347

Change-Id: If408ae5713b36683cfffcdb3c2719bb54f9b0ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 09:50:06 +00:00
Jingwen Chen
dc1231250e Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c am: 79526bd72f am: 8086bbfdb4 am: c5d8845d2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179

Change-Id: Id26a3366ff251433b5047c830390594fbcc7022d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 09:19:21 +00:00
Yike Zhang
6b19c2ee3d Merge "Enable pyfakefs in bp2build" into main am: 95a2901e52 am: d314e6ecbd am: 17706aa7c0 am: 3731a66b5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347

Change-Id: I9ecf7df9153b2650cd008358f5329bb887337fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 09:19:06 +00:00
Jingwen Chen
c5d8845d2d Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c am: 79526bd72f am: 8086bbfdb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179

Change-Id: I8383d44628b53e7bd3bf2013bfab1cb8ae9c3b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 08:46:37 +00:00
Yike Zhang
3731a66b5d Merge "Enable pyfakefs in bp2build" into main am: 95a2901e52 am: d314e6ecbd am: 17706aa7c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347

Change-Id: Ic50d89ba11f47389c322277015bd9a3c47bc1272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 08:46:23 +00:00
Treehugger Robot
d0416e5d6a Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9 am: 7c80f4eb32 am: e105277cfb am: 23eef6ffa2 am: faced18c88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169

Change-Id: I8e0819907ca617fe201491afebf10e4ec9364dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 08:27:58 +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
Treehugger Robot
faced18c88 Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9 am: 7c80f4eb32 am: e105277cfb am: 23eef6ffa2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169

Change-Id: Ic580ac778d9d9d58ff008ed41a5dfd54c90a5524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 07:56:16 +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
Treehugger Robot
23eef6ffa2 Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9 am: 7c80f4eb32 am: e105277cfb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169

Change-Id: I9005ae73e396b46aa0a8e34ba302d8c3cedbcfd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 07:22:08 +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
d53002d4c1 Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb am: 3ce3a959ce am: ba19a4b2cc am: c1c65e6782 am: 63c11459a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509

Change-Id: I827f71d41e519a2df5803a71bd3d0f6c3e563691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 01:48:36 +00:00
Vinh Tran
63c11459a6 Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb am: 3ce3a959ce am: ba19a4b2cc am: c1c65e6782
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509

Change-Id: I6343c2b6989d3c93bc0de7edecb684401fc5cbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 01:18:04 +00:00
Vinh Tran
c1c65e6782 Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb am: 3ce3a959ce am: ba19a4b2cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509

Change-Id: I705e87dc65544a40f0a4a7fd7b22951a468962be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 00:43:52 +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
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
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
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
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
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