StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,627 Commits 1 Branch 0 Tags
1e692ed0876b0caaa646b101b7e456b5ff78398d
Commit Graph

7070 Commits

Author SHA1 Message Date
Zi Wang
894e5ee4c9 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 am: ada4983493 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: I5135ef9ada4e3d6a4bfe104c90b6ffd3d7fe5d02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:57:39 +00:00
Zi Wang
7c5b6d5273 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main 2023-09-23 03:45:48 +00:00
Treehugger Robot
be9f6850a7 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 am: febe41d738 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: I5338f3d74461eaa752ef63eb3e422ae9f4d49771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 02:20:15 +00:00
Chris Parsons
6666d0f6b1 Switch bp2build mutator to bottom up 
This should be no-op, as the underlying mutator has not changed yet.

Some other refactoring is required and done in this CL:

- Delete some old, dead ApiBp2build code
- Fix casting to TopDownMutator when it's not necessary

This change is required to prepare for allowlist v2 work, as only
BottomUp mutators can AddDependency.

Bug: 285631638
Test: m nothing
Test: presubmits
Change-Id: I5212a5f5634cc13056195783e6df37ff8eb000da
 2023-09-22 19:19:22 +00:00
Zi Wang
4dbd0e8688 Pass java_library libs and static_libs to java_*_proto_library 
If a java_library module has proto srcs, a java_*_proto_library target
will be created for it. Proto sources are generated and then compiled
by a java_library target. We need to pass the libs and static_libs of
the java_library module to this java_library target so that
the compile-time classpath is correct.

Test: updated unit tests and CI

Bug: 301469542
Change-Id: I05b2efce6fda2223e85728b3c4c7b1815d04c3dd
 2023-09-22 11:20:06 -07:00
Jihoon Kang
0fbb6e2502 Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp 2023-09-22 16:38:24 +00:00
Alix Espino
540f688f3f Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea am: ea88c79b2e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: Iad5a2b58ed2c08e7d35ade80ec23d1552e06e937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:30:57 +00:00
Alix Espino
c62b27a7ea Merge "Mark android_* modules with java_resources as unconvertible" into main 2023-09-22 14:56:18 +00:00
Jihoon Kang
818f3d9485 RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp 
This change was already submitted with
https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22
but was never propagated to downstream.

Ignore-AOSP-First: change already merged in aosp

Test: m nothing --build-from-text-stub
Change-Id: I1f2f33e1a5df6f7b8f8215ab41b41228fa873ea1
 2023-09-22 00:29:17 +00:00
Romain Jobredeaux
4ed82da99d Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main am: 2c11851598 am: 09ac546858 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752828

Change-Id: I65a7058271eee0e268c150b3ff190aa7bc71f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 22:21:20 +00:00
Romain Jobredeaux
2c11851598 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main 2023-09-21 20:58:16 +00:00
Treehugger Robot
7204781c24 Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a473 am: f7566167dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759108

Change-Id: I718a02e4d41559347cbf6ec6c7032a6fd691503c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:46:13 +00:00
Jingwen Chen
7f2170b57f Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 am: 050f0fa35b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I0adb36e537dd590d827669b76fafce2a92eef479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:04:58 +00:00
Jingwen Chen
47eb84435b Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 am: 915ddd751b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

Change-Id: I592afba5251e1d949af14b2758785be967a41d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:04:34 +00:00
Romain Jobredeaux
5610f9ceb6 Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d am: 4bc34aa84e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: I7fbd8985c92404e17bd5b58ec2c173f869585967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:04:20 +00:00
Jingwen Chen
050f0fa35b Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I2c0c4621425d709ee3d98bdeaf5ebe00a0ee3aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:00:14 +00:00
Jingwen Chen
915ddd751b Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

Change-Id: I6ce6183e2ae3a2a0ebc5dfc8884fb27268831a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:59:43 +00:00
Jingwen Chen
6528999872 Revert^2 "bp2build converter for android_test_helper_app." 
2395286cda

Change-Id: I698c1e62b87f3d8338d8d207d06f62ec680d71c9
 2023-09-21 15:16:59 +00:00
Jingwen Chen
38b7be9d29 Merge "Revert "bp2build converter for android_test_helper_app."" into main 2023-09-21 15:14:29 +00:00
Jingwen Chen
2395286cda Revert "bp2build converter for android_test_helper_app." 
Revert submission 2757525-android_test_helper_app

Reason for revert: broke builds

Reverted changes: /q/submissionid:2757525-android_test_helper_app

Change-Id: I0e5f55078221d7f2151f1bbaa55bebdf5051c03c
 2023-09-21 15:12:19 +00:00
Jingwen Chen
72e22018c3 Merge "bp2build converter for android_test_helper_app." into main 2023-09-21 15:09:06 +00:00
Romain Jobredeaux
4bc34aa84e Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: Ie3d0fefd42a14038e97cbecb5e93f677dca3cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:04:52 +00:00
Romain Jobredeaux
1c4048e08d Merge "Bp2build support for JNI deps of android_app." into main 2023-09-21 14:36:02 +00:00
Treehugger Robot
2b93f0cfb9 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

Change-Id: I706967f2c3bc0798306ce7ef7d367bbe08923528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 04:25:12 +00:00
Treehugger Robot
a1b17990dd Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

Change-Id: I1fc63295438b1e33ab5d7a21dfdc21f8469f7507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 04:20:01 +00:00
Alix
ee51bd6588 Mark android_* modules with java_resources as unconvertible 
Change-Id: I9da921feaf9edb5fe7d1b1cb733494f90d8c64b3
BUG: 300470246
 2023-09-21 03:58:24 +00:00
Treehugger Robot
8d3ea47ec1 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main 2023-09-21 03:38:05 +00:00
Treehugger Robot
ba8d17586a Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba am: 61958c4581 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: I623bf8f9ecec17b6e85675246b01acd6be0a5951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 22:10:16 +00:00
Treehugger Robot
99ccb40d0a Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb am: 1ceda3d5f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I9f0bf636c62b05a7d41c6b11930f6d77a207b38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 22:10:05 +00:00
Treehugger Robot
61958c4581 Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: Id1bda3613b5073ccd8786e81379676f08d637d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 21:12:53 +00:00
Treehugger Robot
1ceda3d5f8 Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I75bf73d10820621dac581358255f9d0295510d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 21:12:40 +00:00
Treehugger Robot
f2d858e5ba Merge "Enable restat for kapt stubs rules" into main 2023-09-20 20:40:28 +00:00
Romain Jobredeaux
947dfa760b Bp2build support for JNI deps of android_app. 
Change-Id: I3f934ecb0323129e1bb1eb75527395e39467380d
Bug: 297405812
 2023-09-20 16:09:13 -04:00
Spandan Das
0e0a880fdd Mark android apps with jni_uses_*_apis as unconvertible 
These properties are used to determine if the app should include the sdk
variant of jni libs. Till we support this, mark androi_app/android_test
that set this property as uncovertible in allowlist v2

Bug: 299360988
Test: created a test app in an android.bp and verified that an
equivalent target is not created if either of these props are set

Change-Id: I925745d2667866a12b71788dc8f1bb1e1f3472cc
 2023-09-20 19:53:30 +00:00
Christopher Parsons
88db04e1a9 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 am: 95f97af223 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

Change-Id: If359a892ba0234fd8cb6842bfb0109644bd1a448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 18:36:11 +00:00
Christopher Parsons
95f97af223 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

Change-Id: I541a63831ce789071cae8554e801fe323be3c6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 18:32:15 +00:00
usta
0391ca4eaa Use same symbol for all receiver functions 
cosmetic change

Bug: NA
Test: NA
Change-Id: I1781de1bd2108547f4da2a967d72a3a56e7362ed
 2023-09-20 18:01:44 +00:00
Colin Cross
ed27322aa5 Enable restat for kapt stubs rules 
The output of the kapt stubs rules only change when the public interface
of a kotlin class changes, which makes them a good candidate for restat.
This will prevent some unnecessary reruns of turbine annotation
processing.

Bug: 297356926
Test: builds
Change-Id: I39bd63284fd37058f69a0a3dace1ea5f4f50e8b5
 2023-09-20 09:53:39 -07:00
Liz Kammer
336739ca4a Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637 am: c4298a325d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385

Change-Id: I7e9b54f36fa6fb32b3c070579859a66bdf3600d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 15:01:49 +00:00
Chris Parsons
637458d326 Have ConvertWBp2build use Bp2buildMutatorContext 
This no-op refactoring facilitates some upcoming functional changes for
"bp2build allowlist v2". The work requires that the bp2build conversion
mutator be changed from a TopDown mutator to a BottomUp mutator.
Refactoring all bp2build-related methods so that they use Bp2buildMutatorContext
makes it easier to make this functional change without touching tens of
files and multiple projects.

Bug: 285631638
Test: m bp2build
Change-Id: I3d1ef3064146e959c6f0dc315350fc9764bf2bd2
 2023-09-20 14:49:35 +00:00
Jingwen Chen
2848be4236 bp2build converter for android_test_helper_app. 
This module converts simply to an android_binary, but with testonly = True.

Test: new unit tests
Test: new example app
Fixes: 283518652
Change-Id: If6b7661c32caa7dada6d492cce106d96236f6205
 2023-09-20 14:31:17 +00:00
Liz Kammer
c4298a325d Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385

Change-Id: Id551b291d40a64b5c48aea5e77bf0e47941408fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 14:03:51 +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
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
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
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
Jingwen Chen
3a02b22205 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

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

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

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

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