Commit graph

62737 commits

Author SHA1 Message Date
Vinh Tran
09c9861dc0 Merge "Add ApexInfo.RequiresLibs to mixed build handler for apex" am: c935d777b7 am: f9a6519191
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2355806

Change-Id: I18110f10042cad06d41eb191d98343597bfe65ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 14:54:42 +00:00
Vinh Tran
f9a6519191 Merge "Add ApexInfo.RequiresLibs to mixed build handler for apex" am: c935d777b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2355806

Change-Id: I1a017549edb0bae83a62500368f390a2502ae45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 14:23:02 +00:00
Vinh Tran
c935d777b7 Merge "Add ApexInfo.RequiresLibs to mixed build handler for apex" 2022-12-15 13:58:31 +00:00
Cole Faust
b85f7b4952 Merge "Remove tzdata from staging allowlist." am: 328770db88 am: 3bcf655735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2351442

Change-Id: I0c8cbbfee7be1964b44e118cd1639389215c8778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 01:20:40 +00:00
Cole Faust
3bcf655735 Merge "Remove tzdata from staging allowlist." am: 328770db88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2351442

Change-Id: I7193c32ea5a511c40f0f74bc21b5cde1623eeeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 00:48:40 +00:00
Cole Faust
328770db88 Merge "Remove tzdata from staging allowlist." 2022-12-15 00:15:55 +00:00
Vinh Tran
b6803a5f52 Add ApexInfo.RequiresLibs to mixed build handler for apex
Adding ApexInfo.RequiresLibs from Bazel to apexBundle.requiredDeps which is eventuallyread by apex androidmk writer for LOCAL_REQUIRED_MODULES to ensures the libs are installed as part of a bundle build.

In Soong, apexBundle.requiredDeps is set in
https://cs.android.com/android/platform/build/soong/+/master:apex/apex.go;l=2305-2323;drc=cb7e73bc0130a95f5991c925c349387185abc098

The same logic is replicated in Bazel at
https://cs.android.com/android/platform/build/bazel/+/master:rules/apex/cc.bzl;l=141-163;drc=cb7e73bc0130a95f5991c925c349387185abc098.

This CL is porting the required libs set by Bazel in mixed build.

Test: go test
Test: run build/bazel/ci/mixed_libc.sh
Bug: 215500321
Change-Id: Id7256d279ac09a8fd42db391a7e93ce0021d8345
2022-12-14 18:54:47 -05:00
Treehugger Robot
2d75ee9a7c Merge "Pass -t epoch to jetifier" am: ccfe6022d4 am: 139eb71b0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2352010

Change-Id: Ic7e1ca2e15c777bd53ca2d6ebcbef0d8b602bfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 16:53:00 +00:00
Sam Delmerico
4df02d88c9 Merge "add APEX transitive dependency validation" am: 5a67ad19da am: 6146002e59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2325607

Change-Id: I604dc474f1e9f24cff20560a41155804b6253ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 16:52:41 +00:00
MarkDacek
421a4d6d28 Remove tzdata from staging allowlist.
This is redundant as it's already in prod.
Test: m nothing

Change-Id: I49f75ce9ed514b77df8089a90a0339a4ab3f1d0b
2022-12-14 16:26:30 +00:00
Treehugger Robot
139eb71b0e Merge "Pass -t epoch to jetifier" am: ccfe6022d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2352010

Change-Id: I52e209f070fcf7d412373d0a57b894e606ca0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 16:21:26 +00:00
Sam Delmerico
6146002e59 Merge "add APEX transitive dependency validation" am: 5a67ad19da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2325607

Change-Id: I7cade0d84d458093b1d38adf339819eed151fbd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 16:20:37 +00:00
Treehugger Robot
ccfe6022d4 Merge "Pass -t epoch to jetifier" 2022-12-14 16:15:18 +00:00
Sam Delmerico
5a67ad19da Merge "add APEX transitive dependency validation" 2022-12-14 15:40:47 +00:00
Jingwen Chen
c147929b06 Merge "Fix "--version_script" typo in doc." am: 90fff77810 am: c1774e4023
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2280756

Change-Id: Id0773027858d720135d5ed410b7531d516cdeaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 13:39:35 +00:00
Jingwen Chen
c1774e4023 Merge "Fix "--version_script" typo in doc." am: 90fff77810
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2280756

Change-Id: Ia398207b4fae413a2cf88f2f3bbf7b4741eaa92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 13:10:36 +00:00
Jingwen Chen
90fff77810 Merge "Fix "--version_script" typo in doc." 2022-12-14 12:38:24 +00:00
Treehugger Robot
38f104bd00 Merge "Remove linkerconfig from bionic list." am: 1f9ca39a5a am: e2250c85fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347950

Change-Id: Ibe246179fb956fdac5ef7b72c7ba9b1bd306e417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 08:05:45 +00:00
Treehugger Robot
e2250c85fb Merge "Remove linkerconfig from bionic list." am: 1f9ca39a5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2347950

Change-Id: I1118794688c9813ea9c4c4ee2859fe66241efe80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 07:34:38 +00:00
Treehugger Robot
1f9ca39a5a Merge "Remove linkerconfig from bionic list." 2022-12-14 07:16:13 +00:00
Treehugger Robot
e8f7279940 Merge "Add arch variants for Intel Atom CPUs" am: 7853388422 am: 0c8d0c782c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301565

Change-Id: I188dc6728fbaa9bef68d20334f9dad48a3c84f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 04:21:42 +00:00
Treehugger Robot
0c8d0c782c Merge "Add arch variants for Intel Atom CPUs" am: 7853388422
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301565

Change-Id: I55da0006eaf1f8f75cc4446670b6e74159278830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 03:50:41 +00:00
Treehugger Robot
7853388422 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Treehugger Robot
a51d34e320 Merge "Workaround bazel command too long" am: b3b43822f9 am: d289dc2881
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2351082

Change-Id: I486cfee7e1c3b01b13b62154523d43d0c649af6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 00:02:52 +00:00
Colin Cross
db9f1af579 Pass -t epoch to jetifier
Pass -t epoch to jetifier to get reproducible output files from it.

Bug: 262448304
Test: builds
Change-Id: I65d42e5d556f27e15e6700363840857c1a25da74
2022-12-13 15:57:01 -08:00
Treehugger Robot
d289dc2881 Merge "Workaround bazel command too long" am: b3b43822f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2351082

Change-Id: I294f4ca2b0bd7ba8250984a0aff3820900c1c6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 23:32:59 +00:00
Treehugger Robot
b3b43822f9 Merge "Workaround bazel command too long" 2022-12-13 23:13:15 +00:00
Yabin Cui
d50b6b3c77 Merge "Update clang version to clang-r475365b" am: 4abd2ca5b4 am: ed0c0078da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2345559

Change-Id: I7e7fe35a55d0ab1de15cb861a1ac49753313a07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 22:46:55 +00:00
Yabin Cui
ed0c0078da Merge "Update clang version to clang-r475365b" am: 4abd2ca5b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2345559

Change-Id: I0d4e2635e547680bdb7e56041f1c7933d4fab47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 22:14:59 +00:00
Greg Kaiser
0c12c19de7 Merge "mk2rbc support for clear_var_list" am: 796469bb6f am: 16cc1ef613
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2338791

Change-Id: Ie5025bca9c22529d09a205d4a5c039048e0bd142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 22:07:55 +00:00
Yabin Cui
4abd2ca5b4 Merge "Update clang version to clang-r475365b" 2022-12-13 21:35:04 +00:00
Greg Kaiser
16cc1ef613 Merge "mk2rbc support for clear_var_list" am: 796469bb6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2338791

Change-Id: I15f8edbab9280c56cf0f7f24e089760341d4ad8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 21:34:09 +00:00
Colin Cross
dab3e71066 Merge "Add external/musl to the bp2build allowlists" am: 7a9803cbde am: 560d8eef62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337364

Change-Id: I00f0d0ea1c6aefbed0f3cd15ff57d4e15047ccaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:51:57 +00:00
Treehugger Robot
6c3f089e09 Merge "Streamline AndroidMk generation" am: 16d87f33a2 am: c8d9d50240
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2334437

Change-Id: I80d64edb7399fc8cbf2e7c1522d6b8ae3593e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:51:18 +00:00
Greg Kaiser
796469bb6f Merge "mk2rbc support for clear_var_list" 2022-12-13 20:50:00 +00:00
Colin Cross
d5c7ddb4df Workaround bazel command too long
Write long bazel commands returned by aquery to a shell script
before executing them to work around command line length limits.

Bug: 261536423
Test: USE_HOST_MUSL=true build/bazel/ci/mixed_libc.sh
Change-Id: Id98a07800df82d1538e6b16b733488a1b9943bf3
2022-12-13 12:40:03 -08:00
Colin Cross
560d8eef62 Merge "Add external/musl to the bp2build allowlists" am: 7a9803cbde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337364

Change-Id: I26e8d7777a7efdfc020aee67be74db368cd9643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:17:22 +00:00
Treehugger Robot
c8d9d50240 Merge "Streamline AndroidMk generation" am: 16d87f33a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2334437

Change-Id: I60500a8b42c107f857758262a3709553dce875fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:16:52 +00:00
Colin Cross
7a9803cbde Merge "Add external/musl to the bp2build allowlists" 2022-12-13 20:00:55 +00:00
Treehugger Robot
16d87f33a2 Merge "Streamline AndroidMk generation" 2022-12-13 19:39:20 +00:00
Sam Delmerico
eddd3c0ba4 add APEX transitive dependency validation
Bug: 218419109
Test: b build //packages/modules/adb/apex:com.android.adbd
Change-Id: I93b0c99d6521e419e52c63271646448f6d708c22
2022-12-13 14:32:19 -05:00
Paul Duffin
2ebf4a146b Merge "Allow building against prerelease prebuilt APEXes" am: f0efd5da1a am: f6352966e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2346323

Change-Id: I57e16a96cd420a54d57f08bba98b96305c0e9d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:41:15 +00:00
Treehugger Robot
8f7e570b42 Merge changes from topics "bp2build_cc_object_dynamic_deps", "bp2build_cc_prebuilt_object" am: 6441a125cf am: 370d5fded1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337365

Change-Id: I787df0555c8bb1c77867e34a3fd6ce8c198c1dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:40:59 +00:00
Colin Cross
b04be90e20 Add bp2build support for cc_prebuilt_object am: c5075e917e am: 08abfa88eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337363

Change-Id: Ia3f9de483dddfd95e12f7e70fada073e33124019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:40:55 +00:00
Paul Duffin
f6352966e4 Merge "Allow building against prerelease prebuilt APEXes" am: f0efd5da1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2346323

Change-Id: I399a32fd56bc0603c29629560081bfd4993494eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:09:29 +00:00
Treehugger Robot
370d5fded1 Merge changes from topics "bp2build_cc_object_dynamic_deps", "bp2build_cc_prebuilt_object" am: 6441a125cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337365

Change-Id: I28d8f8b95f31199d5ffa93bd86878cb0235010cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:09:13 +00:00
Colin Cross
08abfa88eb Add bp2build support for cc_prebuilt_object am: c5075e917e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337363

Change-Id: Icef1065fd50d62537ec6b504d1c2909d11424c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:09:09 +00:00
Paul Duffin
f0efd5da1a Merge "Allow building against prerelease prebuilt APEXes" 2022-12-13 16:28:07 +00:00
Usta (Tsering) Shrestha
3bc4a7f881 Merge "scan and run test_ methods" am: b545f49f06 am: c9f1b9ed7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2334105

Change-Id: I6150decbf890904b181dafb035160d65b494faeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 16:27:02 +00:00
Paul Duffin
2a380bdec3 Merge "Make apex_set support ":<apex>" syntax to access the apex file" am: cb4438ff19 am: 67baf05e0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2346322

Change-Id: Ia08ac9b0f348ae46ce052a7b2f85af29ece1ddef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 16:26:50 +00:00