Commit Graph

72916 Commits

Author SHA1 Message Date
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
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
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
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
Ian Zerny
57beac1b76 Merge "Ignore dex files in input archives" into main 2023-10-12 06:27:02 +00:00
Alix Espino
aa0e12c22b Merge "Use an option struct in aapt.buildActions & manifestMerger" into main am: 37e64f9c91 am: a51e83ac06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769926

Change-Id: I327c89db84f777efe1a2b84b35363501e0701830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 03:57:08 +00:00
Alix Espino
a51e83ac06 Merge "Use an option struct in aapt.buildActions & manifestMerger" into main am: 37e64f9c91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769926

Change-Id: I5438d2f0cd250fdaf81dcf75b2bf257e79822cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 03:24:23 +00:00
Jingwen Chen
d92dba5ca8 Merge "Move platform constraints to bazel_common_rules." into main am: a4c330e076 am: 3781b3c72d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781283

Change-Id: I7bfd5148b3fab776a008146eb2f15b7f0c5402c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 03:07:12 +00:00
Alix Espino
37e64f9c91 Merge "Use an option struct in aapt.buildActions & manifestMerger" into main 2023-10-12 02:53:10 +00:00
Jingwen Chen
3781b3c72d Merge "Move platform constraints to bazel_common_rules." into main am: a4c330e076
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781283

Change-Id: I172e78152870ec4eee21823b69282728a2308168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:34:50 +00:00
Jingwen Chen
a4c330e076 Merge "Move platform constraints to bazel_common_rules." into main 2023-10-12 02:22:26 +00:00
Treehugger Robot
1b8286437b Merge "TestJavaHostGeneral Fix" into main am: 452b794c33 am: bb2d733f22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782251

Change-Id: Ibe411e077a9636ae95c5979e90e7acc1de1977ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:16:50 +00:00
Ramy Medhat
875c0da4c4 Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main am: 67b4973126 am: c0aa94c17a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781987

Change-Id: Iee7e821280c9178873d4599feee45471f7deed5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:16:39 +00:00
Treehugger Robot
bb2d733f22 Merge "TestJavaHostGeneral Fix" into main am: 452b794c33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782251

Change-Id: I5afbed1ebdecea2286247092bb46b655b7e54a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 01:44:46 +00:00
Ramy Medhat
c0aa94c17a Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main am: 67b4973126
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781987

Change-Id: Ib7c036acd04cbef3684818ae2b00b1af0a17e861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 01:43:57 +00:00
Treehugger Robot
452b794c33 Merge "TestJavaHostGeneral Fix" into main 2023-10-12 01:37:32 +00:00
Ramy Medhat
67b4973126 Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main 2023-10-12 01:05:18 +00:00
Krzysztof Kosiński
df5754c8a5 Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main am: 69101d699c am: 029d1673d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784488

Change-Id: I335033907af959ed77efe5534db9df6bf9ec7b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 00:21:03 +00:00
Krzysztof Kosiński
029d1673d7 Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main am: 69101d699c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2784488

Change-Id: I2fddf652c8ce52a58e8b83c44144012ea45911b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:49:21 +00:00
Treehugger Robot
858f6135d1 Merge "Sort genrule allowlists" into main am: 154cf29b57 am: 3cb380098a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782250

Change-Id: I7da2a756f8a14624187ee05b88c1a8cee05857ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:31:54 +00:00
Treehugger Robot
86dbd2ffac Merge "Use make_mock_top function" into main am: 36674db0b3 am: 83ea7f6030
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775287

Change-Id: Ibd71ed5d4f8a8f049df4098001da755b76afaa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:31:33 +00:00
Krzysztof Kosiński
69101d699c Merge "Revert "Enable -Werror=incompatible-function-pointer-types"" into main 2023-10-11 23:16:07 +00:00
Ramya Subramanian
5e75975e04 Revert "Enable -Werror=incompatible-function-pointer-types"
This reverts commit 07c362bf7f.

Reason for revert: DroidMonitor: Potential culprit for Bug 304839693 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.

Change-Id: Iafb894510c48af2dd8b015d7264a031ff9348884
2023-10-11 23:00:33 +00:00
Treehugger Robot
3cb380098a Merge "Sort genrule allowlists" into main am: 154cf29b57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2782250

Change-Id: I0a7d66190e97c5612199f48615552dce34060a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 22:47:29 +00:00
Treehugger Robot
83ea7f6030 Merge "Use make_mock_top function" into main am: 36674db0b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775287

Change-Id: I3be6273b8b92d3be9351e601d6ac280d624d36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 22:47:06 +00:00
Alix
42d7ac96bc TestJavaHostGeneral Fix
This fixes "expected 2 bazel modules in "." but did not find any"
error that the test was getting.

Test: got test ./bp2build
Change-Id: I376c7c9974d301fc85894ecf2b0838c863a74a47
2023-10-11 22:39:27 +00:00
Treehugger Robot
154cf29b57 Merge "Sort genrule allowlists" into main 2023-10-11 22:35:21 +00:00
Treehugger Robot
36674db0b3 Merge "Use make_mock_top function" into main 2023-10-11 22:10:48 +00:00
Jihoon Kang
cc599888db Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361b6 am: 8f9d036314
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781328

Change-Id: Iddf3556aa98fe3cc221f763cb7e30ff1f5dd45e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:26:06 +00:00
Jihoon Kang
059362b5b4 Merge changes I804d3597,I6a25e2f6 into main am: faf7251c7b am: fbe7a9e772
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779190

Change-Id: I219a974ac1f39e58bc4a5c081f15c859064ffd72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:25:40 +00:00
Mark Dacek
f3126835c9 Merge "Add b_args_test." into main am: 360e8ebbff am: ae811fe098
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776568

Change-Id: I12759d7205cc3df8cca6e6d72997b58cca2f9800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:25:26 +00:00
Jihoon Kang
8f9d036314 Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781328

Change-Id: If490466468e4136d52a09e411ce36f7d893245b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:09:38 +00:00
Jihoon Kang
fbe7a9e772 Merge changes I804d3597,I6a25e2f6 into main am: faf7251c7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779190

Change-Id: I3c35421afcf6fa733b7b13b1a425b739981b12c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:08:21 +00:00
Mark Dacek
ae811fe098 Merge "Add b_args_test." into main am: 360e8ebbff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776568

Change-Id: I3d3c25df66fb137b20a79b362a354dab26442e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:08:05 +00:00
Jihoon Kang
c5be9361b6 Merge "Retain concrete overrides of abstract methods by default" into main 2023-10-11 21:02:17 +00:00
Jihoon Kang
faf7251c7b Merge changes I804d3597,I6a25e2f6 into main
* changes:
  Add module dependency checking testing method
  Add droidstub modules for Soong java testing
2023-10-11 20:43:48 +00:00