StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,359 Commits 1 Branch 0 Tags
a521c6928c0c8cccf0c8b3ca2c286f199e994189
Commit Graph

7152 Commits

Author SHA1 Message Date
Jihoon Kang
a521c6928c Merge "Utilize -quiet flag in java_api_library" into main am: ef1fc04e1a am: 8f9e1c9f85 am: 17cec69ff7 am: 1362d1ec21 am: 98e3c85cb4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2749441

Change-Id: I1cd5d9c938306f6aae6dd6fea47e7d0aa28a6503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 19:47:21 +00:00
Jihoon Kang
17cec69ff7 Merge "Utilize -quiet flag in java_api_library" into main am: ef1fc04e1a am: 8f9e1c9f85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2749441

Change-Id: I8a516ff4158b597a5030dbc9ad5127b74c0773fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 17:14:23 +00:00
Paul Duffin
a2a0640d2a Merge "Replace --api-overloaded-method--order with --format-defaults" into main am: 93961bfbe5 am: 3f23d2686b am: 5c6a7f24d9 am: 4eee13da86 am: 26dd92b6de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748754

Change-Id: Ifee92a819d1606fa97247fd7091d894e795774c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 16:21:48 +00:00
Jihoon Kang
8f9e1c9f85 Merge "Utilize -quiet flag in java_api_library" into main am: ef1fc04e1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2749441

Change-Id: I4adba57beef04d888e794f48b573c74de8f9d18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 16:19:57 +00:00
Jihoon Kang
ef1fc04e1a Merge "Utilize -quiet flag in java_api_library" into main 2023-09-13 15:57:11 +00:00
Paul Duffin
5c6a7f24d9 Merge "Replace --api-overloaded-method--order with --format-defaults" into main am: 93961bfbe5 am: 3f23d2686b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748754

Change-Id: I91c29e959b092ef70a34b63e1aba168afb6630cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 13:56:12 +00:00
Paul Duffin
3f23d2686b Merge "Replace --api-overloaded-method--order with --format-defaults" into main am: 93961bfbe5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748754

Change-Id: Ie90cc44469ca4ffdd27070d0c9cb956e31140050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 13:02:00 +00:00
Paul Duffin
93961bfbe5 Merge "Replace --api-overloaded-method--order with --format-defaults" into main 2023-09-13 11:57:03 +00:00
Zi Wang
48eed1fc75 Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 am: bc36c7e264 am: 7018df6938 am: 19c149390a am: e50ae25849 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I3a0b83c04cc0582d16b7fae00ef84733975b0706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:41:32 +00:00
Zi Wang
7018df6938 Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 am: bc36c7e264 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I869460457bdfcbd5a70081cac7b67ad04aed3345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 02:13:58 +00:00
Zi Wang
bc36c7e264 Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I61e88db98415997ea27b0d590e65f36dc8f1e153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 01:19:40 +00:00
Jihoon Kang
d02a43668a Utilize -quiet flag in java_api_library 
java_api_library finds and zips class files based on pattern matching,
leading to multiple missing files warnings being printed to console
during from-text stub build. This change passes the `-quiet` flag to
soong_zip to prevent such warnings from being printed.

Test: m --build-from-text-stub and inspect console output
Bug: 300166930
Change-Id: I23d49b5e3a29d2127f5e917169620e18a98bc06b
 2023-09-13 00:11:01 +00:00
Paul Duffin
504d356579 Replace --api-overloaded-method--order with --format-defaults 
Bug: 300052204
Test: m checkapi
Change-Id: I8952a828437872ceebf7f9da4dc297173ed2a90b
 2023-09-13 00:00:58 +01:00
Romain Jobredeaux
1bd09fddba Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c am: 0b02d44081 am: 935c1b559f am: 7788da47a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I5099b4137314c1b285775f88ed37a99d0374b745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 17:51:04 +00:00
Zi Wang
774c6eaf10 Bp2build: handle the case where java_library has only proto srcs 
java_library doesn't accept deps when there are no srcs because
no compilation happens, but it accepts exports.

The deps from the module are not necessary for compiling the protos,
in which case they are unnecessary as deps on the java_library as well
since they are not be propagated to any dependencies.

So we can put the deps to exports and drop deps here.

Test: CI and added unit test

Bug: 285952385
Change-Id: Ie54a4ac0db592fb96fede64f0e67df309dca9c1d
 2023-09-12 10:41:42 -07:00
Romain Jobredeaux
0b02d44081 Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I15b9f9c8674bda690ebb7a86ddbc281d978b415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 15:25:58 +00:00
Romain Jobredeaux
80a3c08c0c Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I9415e5badd071725187936d3b5f11243e27fbb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 14:32:34 +00:00
Romain Jobredeaux
d2cc5037c2 Re-order android_app bp2build converter logic. 
This change is a no-op but makes it easier to single out framework-res
for conversion in subsequent CL aosp/2720593.

Bug: 276928228
Test: CI
Change-Id: I7c7338add1857697912dec3c34b7c43e06d2d12d
 2023-09-11 16:37:50 -04:00
Treehugger Robot
e5aadb094b Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e am: 3a9ce197a9 am: 0aa01115e4 am: 2b99f4f4b0 am: a2dbcf025b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855

Change-Id: I5c80ae1e7cfd083d5985e64841633328a5867d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 19:48:01 +00:00
Treehugger Robot
0aa01115e4 Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e am: 3a9ce197a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855

Change-Id: I5d9542e0bda630bf785f8a613396f6997fee71e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 17:23:54 +00:00
Treehugger Robot
3a9ce197a9 Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855

Change-Id: Ie61359bea67a9afdf9e1e2e3e29568edfeccba79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:31:33 +00:00
Treehugger Robot
3fb2002c9e Merge changes I86f30b99,I2769c0d5 into main 
* changes:
  Do not convert resource dirs without resources
  Do not convert java libraries with core_platform
 2023-09-08 16:04:45 +00:00
Liz Kammer
33dddf5a7e Do not convert resource dirs without resources 
Previously we would convert to java_resources when there were no
resources and get an error.

Test: b build //external/libphonenumber/... --config=android
Change-Id: I86f30b993a3ffdb20000f6a4c5261e2c4c74263c
 2023-09-08 09:44:00 -04:00
Liz Kammer
65942c8467 Do not convert java libraries with core_platform 
Test: go bp2build tests
Change-Id: I2769c0d589c304caeb24a8ecba38a4a5ee6c63e5
 2023-09-08 09:43:57 -04:00
Treehugger Robot
5b8fce525a Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb am: 278c9d0636 am: 6a492430c9 am: 6d5c3d9e73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I61823bfe4ac6e6f037a1d26012301bd3efba470d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 21:26:15 +00:00
Cole Faust
33ae6e9b0f Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01 am: ee8bcdb34d am: abdcb6841a am: 066c7a930c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: Iba0b20b73129a4bc778ce2c8da50b93a961684c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 21:24:43 +00:00
Treehugger Robot
278c9d0636 Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I9eb8c42cd6bc1cf7deb7626e7b84519527f4a44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 18:10:50 +00:00
Cole Faust
ee8bcdb34d Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: Ib55b1b9ff7e88f9985e61b5b40305e74aaa67423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 18:10:05 +00:00
Treehugger Robot
040d3deedb Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I4d70528e0eda3cdf229c64ddb8cc99eb119015d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 17:20:02 +00:00
Cole Faust
70f839fe01 Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: I6472d8ab1c2fbc221f04f6c63cb6be77d38688fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 17:19:06 +00:00
Treehugger Robot
8763530dff Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main 2023-09-07 16:55:45 +00:00
Cole Faust
1b365e350a Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main 2023-09-07 16:42:08 +00:00
Treehugger Robot
b22cd6bce3 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a am: 86633be948 am: 613e513864 am: 444346dce5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: Icf9d977da869285d2dce8479a0e11a8677424fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 16:30:28 +00:00
Treehugger Robot
86633be948 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: I2a9e372c57bc02780d456bb98ceb1966cf90392b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 14:06:14 +00:00
Treehugger Robot
f7fc893c2a Merge "Modify static lib stub library visiblity" into main am: 968c735108 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: Idbe5d3ee533ceabb35172a586cd89ae567d16554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 13:14:13 +00:00
Treehugger Robot
968c735108 Merge "Modify static lib stub library visiblity" into main 2023-09-07 12:07:17 +00:00
Cole Faust
51d7bfd9a1 Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30" 
This reverts commit d293e28f52.

Reason for revert: The underlying issue was fixed in ag/24685010

Change-Id: I06810d37dba37aa12f9a1e14b0749f1e1eb41136
 2023-09-07 05:31:32 +00:00
Karl Shaffer
e6ee7802b8 Merge "Revert "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: d79c10f71f am: f6182066f9 am: 57c4e6b2af am: 0dd10b4bbb am: 222c611ff5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744115

Change-Id: Ifd8306adc7911be7746b45244387a6d8b4de1d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 05:19:29 +00:00
Karl Shaffer
57c4e6b2af Merge "Revert "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: d79c10f71f am: f6182066f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744115

Change-Id: Iff68934026b2abb1427b222596468e5ec8013fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 02:54:27 +00:00
Karl Shaffer
f6182066f9 Merge "Revert "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: d79c10f71f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744115

Change-Id: I5c43aac2f67fe33f6a021aafedb1d9222e133147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 02:01:09 +00:00
Jihoon Kang
786df93db0 Modify static lib stub library visiblity 
java_sdk_library generates stub java_library module which compiles the
stub generated from either source or txt files, which is toggled based
on the build configuration. The java_api_library/java_library module
that compiles the stubs should not be directly accessible to the modules
outside of the sdk_library module scope, thus modify their visibility as
private.

Test: m nothing
Bug: 299373105
Change-Id: Ia4a08bf6e65c521814c82f54ea43cc8d367834e3
 2023-09-07 01:22:12 +00:00
Cole Faust
90bb56747e Merge "Only allow setting presigned without preprocessed on targetSdk < 30" into main am: 2f681324c2 am: 41c46414f2 am: 031f822e63 am: d02f2e3e5b am: 711b6f7fc5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659055

Change-Id: I49fae95e1f7965ca3b83f6975a78d50f71db7969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 01:15:16 +00:00
Karl Shaffer
d79c10f71f Merge "Revert "Only allow setting presigned without preprocessed on targetSdk < 30"" into main 2023-09-07 00:58:24 +00:00
Karl Shaffer
d293e28f52 Revert "Only allow setting presigned without preprocessed on targetSdk < 30" 
This reverts commit 6158528e15.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_udc-d1-dev-plus-aosp&target=aosp_bramble-trunk_staging-userdebug&lkgb=10771573&lkbb=10771600&fkbb=10771587, bug https://buganizer.corp.google.com/issues/299369971

BUG: 299369971

Change-Id: I6bf6eb5c0fb9e30197e145121adc7ed58871526f
 2023-09-07 00:51:09 +00:00
Cole Faust
031f822e63 Merge "Only allow setting presigned without preprocessed on targetSdk < 30" into main am: 2f681324c2 am: 41c46414f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659055

Change-Id: I3c12f70337bc2632535dce04bdb0707c0224c1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 22:56:14 +00:00
Cole Faust
41c46414f2 Merge "Only allow setting presigned without preprocessed on targetSdk < 30" into main am: 2f681324c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659055

Change-Id: I8e784838bc6316f23b0b99554496e3692ecdcc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 22:04:41 +00:00
Cole Faust
2f681324c2 Merge "Only allow setting presigned without preprocessed on targetSdk < 30" into main 2023-09-06 21:00:15 +00:00
Sam Delmerico
0e0d96efa7 android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE 
Currently the product variable that is controlled by
APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE only overrides apexes, but it
doesn't apply to android_apps. This commit allows android_apps which set
updatable: true in their Android.bp to have their min_sdk_version be
overriden by this product variable.

Bug: 295311875
Test: go test
Change-Id: If3cb82a17cae4553b577dd1a4637ee13c3c95302
 2023-09-05 21:38:16 +00:00
Romain Jobredeaux
5852e4fee9 Merge "Bp2build support for app R8-related fields" into main am: 765beb237a am: 2e5deb49d6 am: f9f4265fd0 am: bd2606d1db am: b9f72f37fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731698

Change-Id: I09c883709cb01ffb6f3bf5d184eee089ec99f562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:45:18 +00:00
Romain Jobredeaux
f9f4265fd0 Merge "Bp2build support for app R8-related fields" into main am: 765beb237a am: 2e5deb49d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731698

Change-Id: I828954953bf888f0b7b5b3328bae2ede09e9051b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:28:33 +00:00