StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,567 Commits 1 Branch 0 Tags
ac553c0e558e404818d9f7ffc307a7cbcd475b38
Commit Graph

7337 Commits

Author SHA1 Message Date
Zi Wang
ac553c0e55 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0 am: b55cc83aa5 am: 840334b327 am: 69dedc4ceb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

Change-Id: Ie25ba2406d474c7678f08e9020aa1408254b9d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 01:18:34 +00:00
Zi Wang
b55cc83aa5 Merge "Add support for java_library proto plugin in bp2build" into main am: b0f3ff43e5 am: 674022ced0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768495

Change-Id: I383f1241634231f84aac1dd17a4743b28a16c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 23:42:54 +00:00
Zi Wang
dbaf6a9dd0 Add support for java_library proto plugin in bp2build 
Test: Added unit test and CI

Bug: 303064670
Change-Id: Idb96ac322aafcb6789ea2002b84a6905d5ec488f
 2023-10-05 12:53:23 -07:00
Treehugger Robot
1d330219d8 Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef am: c2c6d39f72 am: 0453c9526c am: c4fa542b36 am: ec9f51069c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496

Change-Id: I4b62c01a6dfd7981857aa96b86653eb5e425a96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 19:27:19 +00:00
Treehugger Robot
56e1fe9573 Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f am: 1f02fc33a2 am: 742a8bbddd am: e37873e835 am: 5349cc910e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266

Change-Id: Ic5300b27c8f6f3f53713f2670ca8e600f0942c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 19:22:26 +00:00
Anton Hansson
c109c64c0a Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e am: dc99bafb1d am: 88cf24b098 am: 1932d3a09e am: 554b515eea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: I5036c4fd9497e670baf82fd62f60cbfe074cd71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:33:51 +00:00
Treehugger Robot
0453c9526c Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef am: c2c6d39f72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496

Change-Id: I5d0fda68c6ad33e70e6b26c8fa0b36e6607c08c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:48:14 +00:00
Treehugger Robot
742a8bbddd Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f am: 1f02fc33a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266

Change-Id: Ic71072da968635e554f6c3713fe3f9316aa44285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:48:06 +00:00
Treehugger Robot
31a5b2c1ef Merge "Don't create withres-withoutdex files for R8" into main 2023-10-04 17:32:52 +00:00
Treehugger Robot
c68afc4e9f Merge "Remove unnecessary flag for Kotlin compiles" into main 2023-10-04 17:07:22 +00:00
Anton Hansson
88cf24b098 Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e am: dc99bafb1d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: Icaa3a09d152ae1e840df31401107b24a3686b0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 16:43:54 +00:00
Anton Hansson
ddbfdb7f7e Merge "Support passing lint baseline to doclava" into main 2023-10-04 15:53:49 +00:00
Liz Kammer
e10fef75f1 Remove unnecessary flag for Kotlin compiles 
This has been fixed in upstream Kotlin

Test: add /tmp/build.txt file and m metalava
Change-Id: I6d088548ee5a31452ad637bbdd75e26c8863926d
 2023-10-04 10:37:05 -04:00
Treehugger Robot
c20b50564b Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f am: e77d2e4197 am: 5836515d26 am: 3941e8bc58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: I00ef01bde3f03a9e82cdbce3c8e5496f89f98e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 21:56:51 +00:00
Treehugger Robot
e77d2e4197 Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: I592565fda708934caf3089671311abd209fe951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:24:23 +00:00
Jihoon Kang
7ac61080b7 Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 am: 40386ed37e am: f9503e962b am: 2e660fdb2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: I13de5bcfee96d188c68442bda12a7fee6f737aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:07:40 +00:00
Yu Liu
b26082bdb6 Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 am: 2d7db62bcc am: 60ee7d23cd am: f1212c4b0c am: 646a062b48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I923fdd52cd31620bce01564bcf45f6d03710450e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:07:01 +00:00
Treehugger Robot
72928074f5 Merge "Don't delete withres-withoutdex jar from R8 rules" into main 2023-10-03 19:17:56 +00:00
Jihoon Kang
40386ed37e Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: I330c0434af550bc6355342c7c27c20de47080a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:50 +00:00
Yu Liu
60ee7d23cd Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 am: 2d7db62bcc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I8b7b53149dc04abde9dcdaf468c0227a0384bc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:28 +00:00
Colin Cross
8484082fad Don't create withres-withoutdex files for R8 
The withres-withoutdex files were added in b/195558228 because D8
produced errors when given an input jar that contained both class
and dex files:
Error: com.android.tools.r8.internal.Cc: Cannot create android app from an archive 'out/soong/.intermediates/libcore/libcore-crypto-tests/android_common/withres/libcore-crypto-tests.jar' containing both DEX and Java-bytecode content

It turns out R8 doesn't have this problem, it defaults to ignoring *.dex
files unless the com.android.tools.r8.allowDexInputToR8 system property
is set.  Remove the withres-withoutdex files when using R8, but keep
it in place for D8 for now.

Bug: 302573555
Bug: 303264288
Bug: 303064127
Test: m checkbuild
Test: m Calendar && m Calendar
Test: m framework-minus-apex && m framework-minus-apex
Change-Id: Ib6410f7fef6faf5913476c6423cdd27215c68c45
 2023-10-03 18:27:28 +00:00
Jihoon Kang
a7e5e29ec1 Merge changes from topic "expose_flagged_api_revert" into main 
* changes:
  Revert^2 "Add flagged api hide conditional to droidstubs"
  Revert^2 "Add soong config variable Release_expose_flagged_api"
 2023-10-03 17:55:16 +00:00
Yu Liu
7a90fcfa45 Merge "Convert java_aconfig_library to bazel." into main 2023-10-03 17:29:26 +00:00
Colin Cross
b716ceb832 Don't delete withres-withoutdex jar from R8 rules 
R8 rules produce a depfile generated by R8.  R8 sees the withres-withoutdex
jar as an input, and so adds it to the depfile.  If the jar is deleted
after running R8 then ninja will always consider the rule dirty, as the
input file listed in the depfile is missing.

Fixes: 303064127
Test: m Calendar && m Calendar
Test: m framework-minus-apex &&  m framework-minus-apex
Change-Id: I5cbd780b56fc131b58598d6e569a8a78b7fe9395
 2023-10-03 16:42:48 +00:00
Anton Hansson
b06bb5762e Support passing lint baseline to doclava 
There are many issues in the docs, so allow specifying a baseline
file that allows existing lint errors in doclava.

Bug: 217734059
Test: m docs
Change-Id: I8997e47a497e1366247e8354be492805f300a16e
 2023-10-03 12:15:19 +00:00
Thiébaud Weksteen
22d532eb84 Merge changes from topic "linter_integration_tests" into main am: 77b232da24 am: 11e2cee9a6 am: 9e0a9d859a am: 82dd82e3ae am: 81b389f0a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769019

Change-Id: I9dfcbceca891f73825f090d7a2e6e1152a4d80f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 01:27:26 +00:00
Jihoon Kang
c831389625 Revert^2 "Add flagged api hide conditional to droidstubs" 
This reverts commit 1180919dda.

Test: go test ./java && m TARGET_PRODUCT=sdk TESTING_TARGET_RELEASE_NEXT=true nothing and inspect ninja command for generating stubs and verify the flag is included && m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_food nothing and inspect ninja command for generating stubs and verify the flag is not included
Bug: 299570421
Change-Id: I4967376c0236bad729398af80fa59b48dbab5f21
 2023-10-03 01:04:00 +00:00
Thiébaud Weksteen
9e0a9d859a Merge changes from topic "linter_integration_tests" into main am: 77b232da24 am: 11e2cee9a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769019

Change-Id: Id42122ad6f40e317cec4a05e0989f15197d22d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 23:59:43 +00:00
Thiébaud Weksteen
77b232da24 Merge changes from topic "linter_integration_tests" into main 
* changes:
  Add .lint tagged output to Java modules
  Add lint.suppress_exit_code attribute
 2023-10-02 23:26:39 +00:00
Yu Liu
f2b94010c8 Convert java_aconfig_library to bazel. 
Bug: 297357579
Test: Unit test and AconfigJavaHostTest
Change-Id: Icf944cc0b2a7382107923d49b2d2ff0eb4113638
 2023-10-02 15:04:19 -07:00
Thiébaud Weksteen
d054436434 Add .lint tagged output to Java modules 
The linter output can be referenced in other modules for further
processing.

Bug: 302400088
Test: m nothing
Change-Id: I1809b70d8d98ced5d8f3d5f068c6639c782ebebc
 2023-10-02 10:12:30 +11:00
Treehugger Robot
ad12032697 Merge "Delete temporary files after d8 and r8 rules" into main am: 956f79c5d4 am: 737cf4dc67 am: ad0a6f614f am: 1a24a815e0 am: 780c2f3804 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768187

Change-Id: I9649fda5a8d9f97f27359820a8d0f25bba273a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 17:40:42 +00:00
Treehugger Robot
ad0a6f614f Merge "Delete temporary files after d8 and r8 rules" into main am: 956f79c5d4 am: 737cf4dc67 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768187

Change-Id: I0605811c5d0e17a4b8d4e69f9502869924f6ef7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 14:35:42 +00:00
Treehugger Robot
956f79c5d4 Merge "Delete temporary files after d8 and r8 rules" into main 2023-09-29 13:27:57 +00:00
Colin Cross
56e2840a57 Delete temporary files after d8 and r8 rules 
Delete files created within the d8 and r8 rules that are not considered
output files by ninja.  This should reduce disk space usage without
affecting incremental build performance.

Bug: 302573555
Test: m checkbuild
Change-Id: Ifea86888c2f385415735ade7d80cf315bc4d057e
 2023-09-28 17:43:35 -07:00
Thiébaud Weksteen
9c0dff9ae5 Add lint.suppress_exit_code attribute 
The Android lint --exitcode parameter can be skipped using
ANDROID_LINT_SUPPRESS_EXIT_CODE. Expose a similar attribute to Java
modules to ignore the exit code.

This is useful for integration testing. It is possible to build
libraries that report an error when linted. Othewise, such module would
break the checkbuild target.

Bug: 302400088
Test: m nothing
Change-Id: I372c42184f40d25753a688c380c0c63e9758ca00
 2023-09-29 10:24:13 +10:00
Anton Hansson
e2b3f8345f Merge "Make the srcjar for bcp available in OutputFiles" into main am: 0843b79d8c am: 4e34213372 am: 3efbb3649e am: 26a393ca27 am: 11c46f75ed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760367

Change-Id: I0eb48b2f5a650c7c37e443f2b0c5cd7ffd38ffc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 20:45:53 +00:00
Anton Hansson
9f641836e3 Merge "Add srcjar output for platform_bootclasspath" into main am: c38757d0c0 am: 10d91d7107 am: f7931b390a am: 46d7ab27c5 am: 397031a094 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757569

Change-Id: Id0a8acac327fea8f2e2095d38912644ba58c2627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 20:45:44 +00:00
Anton Hansson
1ed4305d11 Merge "Collect transitive source files for java modules" into main am: 9231132099 am: ea95719555 am: 4a1fdf1964 am: 5fd22da744 am: 8a03b6ba70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757568

Change-Id: I08ab8937b7c791c6e7c8440e3c794c59abd28ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 20:45:34 +00:00
Zi Wang
e2929e42a4 Merge "Always drop deps from android_library with no srcs" into main am: 2201343fce am: 50225c86b6 am: 965367f3e0 am: 489210e8c4 am: 4230ef999f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765453

Change-Id: I852f8ebfdd9974e8ab21c47e85b2a107876bdba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 20:44:34 +00:00
Anton Hansson
3efbb3649e Merge "Make the srcjar for bcp available in OutputFiles" into main am: 0843b79d8c am: 4e34213372 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760367

Change-Id: Ifdcedf2168b38559e2c5973bbacb5ad3ae38dd3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:58 +00:00
Anton Hansson
f7931b390a Merge "Add srcjar output for platform_bootclasspath" into main am: c38757d0c0 am: 10d91d7107 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757569

Change-Id: I6ebb3f0be38af38f2f862593a3f185579d231d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:50 +00:00
Anton Hansson
4a1fdf1964 Merge "Collect transitive source files for java modules" into main am: 9231132099 am: ea95719555 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757568

Change-Id: Idad894c8cf621d172f8dc6f9504064de379d0bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:40 +00:00
Zi Wang
965367f3e0 Merge "Always drop deps from android_library with no srcs" into main am: 2201343fce am: 50225c86b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2765453

Change-Id: I1e4500e867959ceae0e96498fa6270772513befa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:27:58 +00:00
Anton Hansson
0843b79d8c Merge "Make the srcjar for bcp available in OutputFiles" into main 2023-09-28 17:09:50 +00:00
Anton Hansson
c38757d0c0 Merge "Add srcjar output for platform_bootclasspath" into main 2023-09-28 16:56:55 +00:00
Anton Hansson
9231132099 Merge "Collect transitive source files for java modules" into main 2023-09-28 16:46:30 +00:00
Zi Wang
2201343fce Merge "Always drop deps from android_library with no srcs" into main 2023-09-28 16:16:51 +00:00
Anton Hansson
b3738ed1f4 Make the srcjar for bcp available in OutputFiles 
This makes it possible for Android.bp files to depends on the srcjar.

Bug: 151360309
Test: m platform-bootclasspath.srcjar
Change-Id: Id42cc3cff89c084b55c7fb0726ad84ecd4f50f58
 2023-09-28 13:22:39 +00:00
Anton Hansson
57162c515e Add srcjar output for platform_bootclasspath 
This output contains all the transitive sources that are contained in
the bootclasspath.

It's currently limited to source-built bootclasspath components. Future
work will make this deal with sdk_library prebuilts.

Bug: 151360309
Test: unit test, as well as manual inspection of platform-bootclasspath
Change-Id: Ie05d8125e19736d8b4b9ebafb70b88a0a40069d5
 2023-09-28 13:21:21 +00:00