Matt Banda
fd70f165f1
Merge "Surface Java APIs Used By APK-only Modules." into tm-dev
2022-04-07 00:04:38 +00:00
Isaac Chiou
b42b4bbabe
Merge "Revert "Use kapt stubs for kotlin header jar for javac"" am: c7bb9d47d6
am: 7d2d0e6d77
am: ef91866a4f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057288
Change-Id: Ic77576558d3734d45b3d2773def8f2ed2d0acc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 09:24:10 +00:00
Isaac Chiou
c7bb9d47d6
Merge "Revert "Use kapt stubs for kotlin header jar for javac""
2022-04-06 08:25:29 +00:00
Isaac Chiou
a23d994022
Revert "Use kapt stubs for kotlin header jar for javac"
...
This reverts commit c6ef485370
.
Reason for revert: Multiple systemui presubmits are broken due to this change
Bug: 228262695
Change-Id: I1efed519c49d8d0583815c7bf2b3801bf0ba12fa
2022-04-06 07:04:09 +00:00
Wei Li
296d499653
Merge "Export provenance metadata for prebuilt APKs and APEXes." am: c055d88c16
am: c41308e05e
am: d58ecd96a8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045371
Change-Id: Idd4f83b79dd05e7f299cd26110bdc1f22d7b2e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 05:32:38 +00:00
Wei Li
c055d88c16
Merge "Export provenance metadata for prebuilt APKs and APEXes."
2022-04-06 04:03:41 +00:00
Colin Cross
8e1ded0dc6
Merge "Use kapt stubs for kotlin header jar for javac" am: 40f8c75752
am: c139d442a8
am: da9b9971d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047063
Change-Id: I9e1a130c71f622af7f5960d1443b5aa178681777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:36:41 +00:00
Colin Cross
896db3b54b
Merge "Enable turbine for api generating annotation processors when using kotlin" am: bbf5f8c158
am: 7574476c78
am: 09d3d9fb49
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2046153
Change-Id: Ib9620eec2e6d1bb3661b9efc1cc708eaad061e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:36:33 +00:00
Colin Cross
0b88c69c7f
Merge "Enable kotlin's jvm-abi-gen plugin to generate header jars" am: 93d65fb60d
am: 5e281cd016
am: 47790e8bbb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2046152
Change-Id: I24eccda6e30bb605f21597c0f334893a0a3eaefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:36:16 +00:00
Colin Cross
42e0005e7a
Merge "Enable restat for sbox rules" am: 209844ce1c
am: 55d2f88cc8
am: 299cadf6eb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2046151
Change-Id: I72aabaf85b3ba6ee34d8ac680804b8e1f8fc0e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:35:58 +00:00
Colin Cross
40f8c75752
Merge "Use kapt stubs for kotlin header jar for javac"
2022-04-05 23:59:34 +00:00
Colin Cross
bbf5f8c158
Merge "Enable turbine for api generating annotation processors when using kotlin"
2022-04-05 23:48:12 +00:00
Colin Cross
93d65fb60d
Merge "Enable kotlin's jvm-abi-gen plugin to generate header jars"
2022-04-05 23:32:54 +00:00
Wei Li
340ee8e699
Export provenance metadata for prebuilt APKs and APEXes.
...
Bug: 217434690
Test: atest --host gen_provenance_metadata_test
Test: m provenance_metadata
Change-Id: I91c184b6e6fe5ccfc3fc65b55b09e7a3da9502a0
2022-04-05 16:16:16 -07:00
Colin Cross
209844ce1c
Merge "Enable restat for sbox rules"
2022-04-05 22:49:10 +00:00
Matt Banda
8c80126987
Surface Java APIs Used By APK-only Modules.
...
Previously we were only generating used-by API-coverage for APEX modules.
This change adds support for APK-only modules such as NetworkStack and DocumentsUI.
Bug: b/216313756
Forrest Run: https://android-build.googleplex.com/builds/abtd/run/L10800000953846781
Test: TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j16
Change-Id: Id17e4a55c2a52e9903632a654e778f8d54982dfc
Merged-In: Id17e4a55c2a52e9903632a654e778f8d54982dfc
(cherry picked from commit 56d75785bd
)
2022-04-05 21:28:29 +00:00
Treehugger Robot
6d3c98c603
Merge "support errorprone javacflags" am: ef03b3d8ba
am: 9f677ae8c7
am: 2c7155c74e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2029264
Change-Id: I3723bec4cf3b235e95d73459da5d92af4939873e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 20:43:58 +00:00
Treehugger Robot
ef03b3d8ba
Merge "support errorprone javacflags"
2022-04-05 17:46:08 +00:00
Anton Hansson
40f8841bf8
Merge "Remove apex framework jars from hard-coded list" am: 71cf2a3cc6
am: 3969920129
am: 3cbb5e929d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054405
Change-Id: I1e42f76aaf9790701362c0d103b8b3e7ba4e79fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 12:20:26 +00:00
Anton Hansson
71cf2a3cc6
Merge "Remove apex framework jars from hard-coded list"
2022-04-05 11:46:04 +00:00
Anton Hansson
51bbac2137
Remove apex framework jars from hard-coded list
...
All apex jars get auto-instrumented since
I2b1c0736202de26c5ea88c0ab14574bd7207a5fb
Test: $ EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m nothing && \
$ grep LOCAL_MODULE.*framework-sdkextensions.com.android.sdkext$ \
out/soong/Android-aosp_coral.mk -A9 -B2 | grep JACO
Change-Id: I1de5ba6673bef93b16c302412f920d93129d4420
2022-04-05 09:00:57 +00:00
Treehugger Robot
c7f2125a26
Merge "Keep dependency files out of the apk file." am: 5f58c378b6
am: d4a37e0757
am: f82be53525
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2055425
Change-Id: Ifdaf251cae92a6cb38f338e1455390fea84fc5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 06:50:38 +00:00
Treehugger Robot
5f58c378b6
Merge "Keep dependency files out of the apk file."
2022-04-05 05:53:22 +00:00
Bob Badour
2c8888edef
Keep dependency files out of the apk file.
...
Bug: 227682036
Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97
Change-Id: I1a9775af7c652191bb1ce3b97c1cb9365b469c19
2022-04-04 19:21:18 -07:00
Colin Cross
c6ef485370
Use kapt stubs for kotlin header jar for javac
...
When compling kotlin code with annotation processors we are generating
java stubs for the kotlin sources using kapt, and parsing them in
turbine when running the annotation processors. Passing --output
to turbine will also compile the stubs into a header jar that can
be used as a dependency to javac, allowing the javac and kotlinc
rules to run in parallel. The turbine-apt header jar can't be used
as the header jar for downstream modules as it doesn't contain the
kotlin metadata needed by kotlinc rules, so the kotlinc gen-jvm-abi
plugin output is still used for the module's final header jar.
Test: TestKapt
Bug: 222095735
Change-Id: I82d0900f3dc30f3e3ebd7cab0693dfe741d9b955
2022-04-04 16:42:46 -07:00
Colin Cross
b5db401599
Enable turbine for api generating annotation processors when using kotlin
...
Normally turbine is disabled when an api generating annotation processor
is in use because the annotation processors are run in javac, so any
generated api would not be present in the turbine header jar. When
compiling with kotlin and annotation processors, the annotation processors
(including any that generate api) are run in an extra turbine invocation
to generate sources to make the results visible to kotlinc, and so can
also be compiled by the normal turbine invocation. Force turbine enabled
when kotlin sources are present.
Test: m SystemUI
Bug: 222095735
Change-Id: I5fcfe67e46cb4a4e90388f088327488959b6571f
2022-04-04 16:42:46 -07:00
Colin Cross
220a9a1245
Enable kotlin's jvm-abi-gen plugin to generate header jars
...
Kotlin's jvm-abi-gen plugin can generate header jars similar to the
turbine output for java sources, which can be used to avoid recompiling
downstream modules when the ABI hasn't changed. Unlike turbine, the
plugin runs as part of the main kotlinc invocation, so it doesn't allow
the downstream modules to start compiling any sooner.
A future possible optimization is to use turbine to compile the kapt
stubs, at least for the kotlin+annotation processor modules that already
generate them, which would allow compiling downstream modules before
invoking kotlinc or javac, as well as invoking kotlinc and javac in
parallel with each other.
Bug: 222095735
Test: TestKotlin
Test: m SystemUI
Change-Id: Ib1bb2ecea47c851a108a26f9ed4f827f289d1321
2022-04-04 16:42:46 -07:00
Colin Cross
e52c2ac7fb
Enable restat for sbox rules
...
Add support to sbox for only writing output files if they are changed
to support enabling restat. Move the clearing of the output directory
into sbox, and when write if changed is enabled delete obsolete output
files without deleting output files that will be replaced.
Enable restat for local metalava rules. Restat for metalava rules
run remotely is still blocked on b/183630617.
Bug: 222095735
Test: TestRuleBuilder_Build
Test: m SystemUI
Change-Id: If8fc47e711f4a6f43947ab69f17cccc8ba6ae61a
2022-04-04 16:42:46 -07:00
Treehugger Robot
bb30ef3fd3
Merge "convert java_import jars with arch variants" am: 7a45d37e62
am: 0050ed2760
am: c70a811766
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995732
Change-Id: I4a7caa5085dffcfad1b7413582ffcbfd0cd77220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-04 17:02:11 +00:00
Treehugger Robot
7a45d37e62
Merge "convert java_import jars with arch variants"
2022-04-04 16:06:55 +00:00
Bob Badour
0a6539dd21
Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451
am: b0489dec23
am: bf82573d27
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564
Change-Id: I0a1a9a0ea0ccd052dbc84cc6b2cce0b128393f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-02 01:48:21 +00:00
Bob Badour
3aae38d451
Merge "Revert "Revert "Build notice files from license metadata."""
2022-04-02 00:43:34 +00:00
Ember Rose
09ba2cc0ab
Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f
am: f4d7122237
am: 3739605cea
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891
Change-Id: Ie892f9594afc504be62a7a1c19bfda3541f99f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:55:06 +00:00
Bob Badour
de6a087d2d
Revert "Revert "Build notice files from license metadata.""
...
This reverts commit 77807b3c27
.
Reason for revert: fix and roll forward again
Change-Id: I80c796ca81ecf29df9522babe54d684a0d11b9e6
2022-04-01 18:00:00 +00:00
Ember Rose
1d3b79f78f
Merge "Rename InvalidNullabilityOverride suppression"
2022-04-01 17:53:00 +00:00
Wei Sheng Shih
67c0b63929
Revert "Build notice files from license metadata." am: 77807b3c27
am: 72f9cdb599
am: 6c698e406d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565
Change-Id: I7e4f410833a4b8349e476d6fca4b2161c8f254f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:26:29 +00:00
Ember Rose
7c57af39e5
Rename InvalidNullabilityOverride suppression
...
Test: N/A
Bug: 227661934
Change-Id: I26fcb5b7de58e8c982054a5a54e3526e0b8be2a2
2022-04-01 10:38:54 -04:00
Wei Sheng Shih
77807b3c27
Revert "Build notice files from license metadata."
...
This reverts commit 43c2dcaef6
.
Reason for revert: suspect build break
Bug: 227682036
Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97
Change-Id: Ibfb8b4fefc264f52f32ba661c269a9cd625d800a
2022-04-01 14:10:53 +00:00
Bob Badour
c64d309ce2
Fix breakage: bad path join using '/' literal am: 2a5c090c31
am: cf96d25b3d
am: ec84245e25
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015
Change-Id: I5e8ea66626e0cde29a7c24f370b85548ae6b5d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:27:15 +00:00
Bob Badour
2a5c090c31
Fix breakage: bad path join using '/' literal
...
Typo in filename s/b NOTICE.html.gz not NOTICES.html.gz
Bug: 227682036
Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97
Change-Id: I75cc28e3ef22d975ad46f4e167071f6d82ba253d
2022-03-31 23:40:28 -07:00
Bob Badour
8d17118d5a
Build notice files from license metadata. am: 43c2dcaef6
am: 6f7de5b1a9
am: cbcf8d9b05
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886
Change-Id: I6a76eee6321538b70c331a2e2a9cb1e5b644ac04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 23:13:51 +00:00
Sam Delmerico
489831660c
convert java_import jars with arch variants
...
Bug: 220168131
Test: go test ./bp2build -run TestJavaImport
Test: b build '...'
Change-Id: Ib485e6905e7be9d199af5295b23131c226fd6e96
2022-03-31 21:00:24 +00:00
Bob Badour
43c2dcaef6
Build notice files from license metadata.
...
Switch from generate-notice-files.py and mergenotice.py to htmlnotice.
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m droid dist reportmissinglicenses
Change-Id: I6cac049d24f35ec358c6f341a04f4ba6161703bf
2022-03-31 17:29:01 +00:00
Sam Delmerico
58614c0414
support errorprone javacflags
...
Soong has a separate property specifically for errorprone javacflags
that we need to add to the Bazel javacopts.
Test: go test ./bp2build
Change-Id: I5299f45793d2b05a6a71b94dd17ceb797f407846
2022-03-31 14:38:07 +00:00
Sam Delmerico
dc459dc9c1
Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3
am: a2db166241
am: fd13aac77a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106
Change-Id: I320fc8b4385337497d684399e6f6b0c54084f8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 22:07:11 +00:00
Treehugger Robot
5d123b15d9
Merge changes from topic "no-srcs-no-deps" am: d93afba1e6
am: d218781011
am: beb28cd9ad
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730
Change-Id: I8c8c7b973ffc6a6dfd91c35dc96e73c42bf30577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 22:07:01 +00:00
Sam Delmerico
3c25ab1ac3
Merge changes I8e4c3f37,I89a32bde
...
* changes:
add plugins to javaLibraryAttributes
convert java_import_host with bp2build; enable jetifier
2022-03-30 21:08:12 +00:00
Treehugger Robot
d93afba1e6
Merge changes from topic "no-srcs-no-deps"
...
* changes:
enable conversion of all java_import modules
emulate java_library static_deps with Bazel exports
2022-03-30 21:06:46 +00:00
Sam Delmerico
77267c7d9c
add plugins to javaLibraryAttributes
...
Test: go test ./bp2build
Change-Id: I8e4c3f373c62c60ea5013cd8c585915a366c1f81
2022-03-30 19:19:13 +00:00
Sam Delmerico
5f83b491b4
convert java_import_host with bp2build; enable jetifier
...
Also, add java_imports that were blocked by jetifier binary.
b/221082840 was blocking the build of jetifier which these java_imports
depended on. That bug is now resolved, so we can unblock these targets.
Bug: 220168131
Test: b build //packages/apps/Car/libs/car-ui-lib/car-ui-androidx/...
Test: build/bazel/ci/bp2build.sh
Change-Id: I89a32bde30c133a44aeb7826afa11d4140433f5d
2022-03-30 19:19:13 +00:00