Commit Graph

76865 Commits

Author SHA1 Message Date
Liz Kammer
3c94d1a55d Always convert prebuilt cc library headers am: 86a407f284
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806

Change-Id: I3f359524e03a303ea1130059177690223789d785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 14:03:43 +00:00
Treehugger Robot
ae45baa5d8 Merge "Make bp2build_all_srcs manual." into main am: 187af6648d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187

Change-Id: I035085e6d65fdf4bc18bb4871e1af4bea2043cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 14:03:05 +00:00
Aleksei Vetrov
d1d3781cdc Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6 am: faa2334d9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785

Change-Id: Ia0083329ebf80d6b80eb24b65aca3a7af02f251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 13:14:51 +00:00
Liz Kammer
9e12c78637 Merge changes from topic "prebuilt-cc-shared-always" into main
* changes:
  Implement bp2build for java_sdk_library_import
  Always convert prebuilt libraries
  Always convert prebuilt cc library headers
2023-09-20 13:13:51 +00:00
Treehugger Robot
187af6648d Merge "Make bp2build_all_srcs manual." into main 2023-09-20 12:58:00 +00:00
Aleksei Vetrov
faa2334d9c Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785

Change-Id: Ia771771d4651ccc9865575a64f7743b2a7bb9ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 12:16:55 +00:00
Aleksei Vetrov
ed8fb7a6a6 Merge "NDK library: use prebuilts to check next level ABI" into main 2023-09-20 11:16:59 +00:00
Jingwen Chen
5802d0795b Make bp2build_all_srcs manual.
So that ... and :all target patterns don't pick it up.

Test: b build //bionic/libc/... and check that none of the filegroups
are built.

Change-Id: I79cd6fb6f7559409ae3e5b95b8b260970810cf7f
2023-09-20 10:25:09 +00:00
Cole Faust
9eede62c52 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 am: d36d0e5082 am: 0363b7c720 am: 89ff7490b3 am: 77ced78e01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I207ce7c33b39a8d384ef015349c0206c37f1b200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 00:48:15 +00:00
Christopher Parsons
c382699779 Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40 am: 3092afc3c2 am: aa457e173a am: ce578b24dd am: ea0d0aace4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925

Change-Id: Ifc5de4b6cf86c35cf230f0b2964f6a04a562960e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 00:45:58 +00:00
Cole Faust
77ced78e01 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 am: d36d0e5082 am: 0363b7c720 am: 89ff7490b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: Idd8246692c61f1c4381ee6c11d3351bc3c89e9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 23:43:32 +00:00
Christopher Parsons
ea0d0aace4 Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40 am: 3092afc3c2 am: aa457e173a am: ce578b24dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925

Change-Id: I15d2f1255056a121fb7e82e2b0d4bd9aea8ea605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 23:41:44 +00:00
Cole Faust
89ff7490b3 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 am: d36d0e5082 am: 0363b7c720
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I88dad4a99d32f303698a20cd0b0415a696aac4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 23:03:21 +00:00
Christopher Parsons
ce578b24dd Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40 am: 3092afc3c2 am: aa457e173a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925

Change-Id: I81c4cae6d8696daa55bc52f1f049aee3a49a5160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 23:02:03 +00:00
Cole Faust
0363b7c720 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 am: d36d0e5082
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I526d6a0675bfc4b5a43e7497e9a8bd434ec2fa90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:21:59 +00:00
Christopher Parsons
aa457e173a Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40 am: 3092afc3c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925

Change-Id: Id717d1038a870056db7ff47701e196410b979615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:21:36 +00:00
Cole Faust
d36d0e5082 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I1042a44c0a4a1ea25a46b66d5fec903f646b4eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:16:34 +00:00
Cole Faust
c0f7bd1a15 Merge "Move the android_platform next to it's entrypoint product config file" into main 2023-09-19 20:42:52 +00:00
Aditya Kumar
ac1755be99 Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db am: 37efec585e am: 6a3d41d8b3 am: 45364dedeb am: 9a68b61fe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805

Change-Id: Ie9a383d779295688d8885f47d0dc1b8fcce6fa68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 20:27:18 +00:00
Sami Tolvanen
fa6c8a5058 Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226 am: 588514f0be am: 45af8ea092 am: 9cf8c7d72b am: c982e5a13a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755625

Change-Id: I1e2fd371f8c1b879e1350773033aa01a29640933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 20:26:29 +00:00
Christopher Parsons
3092afc3c2 Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925

Change-Id: I67fedb5715b0d6cdb90f7f7af0187289a504f955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 20:24:22 +00:00
Liz Kammer
01de3ac619 Add keep sorted tags
Test: n/a
Change-Id: Ibfb96b3e9c2f4707eb585714069bbb81671457b4
2023-09-19 16:04:41 -04:00
Liz Kammer
e1b39a5286 Handle prebuilt vs source selection in bp2build
Test: enable mainline modules build from prebuilts and build
Bug: 300640274
Change-Id: Ib1d6bbca7e0ab459515d3cf6378741e8368e7327
2023-09-19 16:04:39 -04:00
Liz Kammer
9e2a5a7d6d Don't panic for unhandled product vars
Instead, we return an error. This allows us to access some product
variable information earlier when it will not be used as an attribute
without panicing

Test: m nothing
Change-Id: Id094b2b9e1364a8d174d99b3824fa149fb235b3e
2023-09-19 15:58:22 -04:00
Liz Kammer
e0cbc983ec Always convert prebuilt libraries
Test: CI
Test: patch in CL using prebuilt mainline modules & build
Bug: 300640274
Change-Id: Ie00b111a04198b266985f3e1c34c960844c0a327
2023-09-19 15:58:22 -04:00
Liz Kammer
9a97a8f62a Implement bp2build for java_sdk_library_import
Test: go test bp2build conversion tests
Test: enable modules build from prebuilt and m nothing
Bug: 300640274
Change-Id: I8c015aec546d052bef6c42869e12db4e87d39780
2023-09-19 15:58:22 -04:00
Liz Kammer
86a407f284 Always convert prebuilt cc library headers
Test: go tests
Test: CI
Test: patch in CL using prebuilts for mainline modules and build
Bug: 300640274
Change-Id: I73f70dac679e341670e1484ce57bc984f413d409
2023-09-19 15:58:20 -04:00
Christopher Parsons
06ac78ce40 Merge "Refactor bp2build tests for allowlist v2" into main 2023-09-19 19:42:40 +00:00
Aditya Kumar
9a68b61fe0 Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db am: 37efec585e am: 6a3d41d8b3 am: 45364dedeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805

Change-Id: Ifff00f4c5de2915b8782d836a8de9676f1ffd1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 19:23:04 +00:00
Sami Tolvanen
c982e5a13a Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226 am: 588514f0be am: 45af8ea092 am: 9cf8c7d72b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755625

Change-Id: Ib2be71cd6ae4b49bc68425734a6823a6d0d922fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 19:22:08 +00:00
Aditya Kumar
45364dedeb Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db am: 37efec585e am: 6a3d41d8b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805

Change-Id: I1e8ff7658d0b7b12df90aa3b7d65ac25f8ad6b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 18:41:00 +00:00
Sami Tolvanen
9cf8c7d72b Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226 am: 588514f0be am: 45af8ea092
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755625

Change-Id: Ic912bb4103ddf8e300305a2537f9aad0d4dab535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 18:40:42 +00:00
Aditya Kumar
6a3d41d8b3 Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db am: 37efec585e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805

Change-Id: I6ee12fa97502ffc5b8c9c57de68496d46372df2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 17:47:35 +00:00
Sami Tolvanen
45af8ea092 Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226 am: 588514f0be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755625

Change-Id: Ib2ec8f052640d38c47f658a06e053453be7d9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 17:46:56 +00:00
Aditya Kumar
37efec585e Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805

Change-Id: I8877fd822e4ce06810c1403d830d30ab486f80df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 17:41:42 +00:00
Chris Parsons
cd209035aa Refactor bp2build tests for allowlist v2
Allowlist v2 will change bp2build by automatically disabling rdeps of
unconvertible modules. Many bp2build tests create bp2build stub modules
without an implementation,
This CL changes setup of such tests to also contain a BUILD file with
"stub implementations" of equivalent targets, to keep these test targets
convertible.

To verify this change in-place, this CL removes `bp2build_available:
false` from these dependencies.

This is a test-only change for bp2build tests.

Bug: 285631638
Test: m bp2build
Change-Id: I489480cbc4158a416b7abf57c35a6e2bc2ad6173
2023-09-19 17:04:11 +00:00
Cole Faust
b4cb0c857f Move the android_platform next to it's entrypoint product config file
Because we're going to start generating partition images for the
product, and the partitions will eventually be checked in, we want
them to be in sensible locations. And the platform should be there as
well so all the targets for a product are co-located.

Bug: 297269187
Test: m nothing && b build --config=android //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: Iaa25c44aa00295ada279d5fd49b5498bbafb89d5
2023-09-19 09:54:59 -07:00
Aditya Kumar
a1a29b75db Merge "Revert "Revert "riscv64: enable V.""" into main 2023-09-19 16:52:31 +00:00
Sami Tolvanen
588514f0be Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755625

Change-Id: I1cc9ae45cce1719eb4552e09a0ff2793f8472c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 16:48:08 +00:00
Sami Tolvanen
95ad0a9226 Merge "Reapply "Enable CFI for riscv64"" into main 2023-09-19 16:11:26 +00:00
Aleksei Vetrov
8c02bbc533 NDK library: use prebuilts to check next level ABI
NDK has two ABI checks:

1. Check that prebuilt ABI exactly matches compiled binaries.

2. Check that ABI of level X compatible with level X+1.

The second check used compiled binaries for level X and prebuilts for
level X+1. But this approach may confuse people, because ABI change will
be shown "reversed". For example, adding new field to ABI monitored
binary of level X would be shown as "removed" when compared to level X+1
prebuilt.

This change uses prebuilts for both level X and level X+1. Given, that
prebuilts are checked to match compiled binaries, this should be enough.

Change-Id: If942e4319744bc5a2674cdd65f6a6f664fdfaa7e
Signed-off-by: Aleksei Vetrov <vvvvvv@google.com>
2023-09-19 15:50:47 +00:00
Jingwen Chen
3284042a0e Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205 am: cd2454b172 am: 278d4778c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I7594547b6f80d7b63cde2458d556ccad3b7d508e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:46:52 +00:00
Jihoon Kang
b2386a378a Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3 am: f8b75c06ba am: 999d6f8b0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Id2100cd5a805d7d4579530992e4fb65958796e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:46:28 +00:00
Treehugger Robot
9e4277c9c0 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b am: 4e5024f516 am: 75625e3a04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: I4c6e652c3c77bfd2c3022c10b33e8c6271b0bb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:45:01 +00:00
Jingwen Chen
278d4778c8 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205 am: cd2454b172
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I7f57a7958fab989c1568d6e74b22ecc9e28f4454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:42:20 +00:00
Jihoon Kang
999d6f8b0a Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3 am: f8b75c06ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Ic17e5e48dd0dda5b555581d0145830e3b472362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:42:00 +00:00
Treehugger Robot
75625e3a04 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b am: 4e5024f516
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: I11fef7f50736c02e8c81f5cb86909e0c4dd1d6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:41:40 +00:00
Jingwen Chen
cd2454b172 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: Ia68b1b272897630c77a39db7b3f7153ccbeadc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:02:23 +00:00
Jihoon Kang
f8b75c06ba Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Iffc00859104be5075a47822104d49aaf56cb5257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:02:07 +00:00
Treehugger Robot
4e5024f516 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: Id73c1aed26ada4164b430084513cc29e93f35d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:01:58 +00:00