Treehugger Robot
91255a653f
Merge "Prototype changes for multitree" am: 184a6b87e5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076401
Change-Id: I9454e90eba0ed585fdbb9ca1b5041e88c8ec14d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:01:14 +00:00
Treehugger Robot
969d2b5af9
Merge "Convert $(words) to Starlark" am: f8c3412822
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073975
Change-Id: I2c27e33b81ba0ad1edc30eaea9134233f3afea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:00:15 +00:00
Treehugger Robot
87089903c2
Merge "Use --dependency-file when linking elf files." am: ff22afa704
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975926
Change-Id: Ic3e05e629701597c79ce222e1b73ddbd0273b007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:00:06 +00:00
Paul Duffin
79c44417b0
Merge "Allow framework-media to build the framework-media.impl" am: fb14b52747
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359
Change-Id: If34a3316c996a40ca0390b3858e589e85681e925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:59:55 +00:00
Treehugger Robot
184a6b87e5
Merge "Prototype changes for multitree"
2022-04-28 22:20:47 +00:00
Treehugger Robot
f8c3412822
Merge "Convert $(words) to Starlark"
2022-04-28 22:18:07 +00:00
Treehugger Robot
ff22afa704
Merge "Use --dependency-file when linking elf files."
2022-04-28 22:14:54 +00:00
Paul Duffin
fb14b52747
Merge "Allow framework-media to build the framework-media.impl"
2022-04-28 21:10:16 +00:00
Cole Faust
b52f187a22
Merge "Allow seeing include $(x) when there is an include_top comment" am: 16bb2d044d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076911
Change-Id: Ie6a0c47b3fc54b4779da621c4eba16ae169e0074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:45 +00:00
Treehugger Robot
c16665bc17
Merge "Convert includes/inherits inside evals" am: e8f19f3dd7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073866
Change-Id: I05fe227917386a325f86f83a70b80f404bf4eab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:34 +00:00
Cole Faust
16bb2d044d
Merge "Allow seeing include $(x) when there is an include_top comment"
2022-04-28 20:49:17 +00:00
Treehugger Robot
e8f19f3dd7
Merge "Convert includes/inherits inside evals"
2022-04-28 20:43:29 +00:00
Kousik Kumar
e4b4c45bf2
Merge "Add a warning message about missing gcert at the end of the build" am: 4e3c26602f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078459
Change-Id: I8274f0a1602d86d896ebebafa03635c4618647d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:57 +00:00
Cole Faust
a27ee862e2
Merge "Allow comparing $(wildcard) results to non-empty values" am: 1a3e5effa8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075735
Change-Id: I10f1ed3fc07de5ca14640a877801107a2cb9184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:36 +00:00
Kousik Kumar
4e3c26602f
Merge "Add a warning message about missing gcert at the end of the build"
2022-04-28 19:55:30 +00:00
Cole Faust
1a3e5effa8
Merge "Allow comparing $(wildcard) results to non-empty values"
2022-04-28 19:54:32 +00:00
Treehugger Robot
705d009fbb
Merge "Set the dist dir for musl targets of build_version_test" am: f7fa021b65
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079658
Change-Id: Id1cbde34a306e9b2b120a3b198cb1442ab736cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:58:46 +00:00
Treehugger Robot
63015df873
Merge "Correctly serialize class loader context for "any" SDK version to JSON." am: 1b60bb4fe1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077659
Change-Id: I7ee478d26bb7741a6d75a8ba0f668a3d9bb8622f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:58:05 +00:00
Treehugger Robot
f7fa021b65
Merge "Set the dist dir for musl targets of build_version_test"
2022-04-28 16:51:24 +00:00
Treehugger Robot
1b60bb4fe1
Merge "Correctly serialize class loader context for "any" SDK version to JSON."
2022-04-28 15:46:04 +00:00
Paul Duffin
77590a8263
Allow framework-media to build the framework-media.impl
...
The framework-media java_sdk_library is currently api_only for legacy
reasons. This change allows it to also build the framework-media.impl
library by making the following changes:
* Adds impl_only_static_libs to allow the implementation to statically
include other libraries, something no other java_sdk_library has
needed to do.
* Passes the apex_availability property through to the impl library so
it can be statically included in the updatable-media which is what is
included in the apex, again for legacy reasons.
Bug: 190807367
Bug: 229932396
Test: m com.android.media media-module-sdk
# Compare before and after this change (and corresponding change
# to updatable-media/framework-media.
Change-Id: I9e1837edcca6f5fa84fc611274cf8fbba8a896b8
2022-04-28 14:30:14 +00:00
Oriol Prieto Gasco
eda12cb250
Set the dist dir for musl targets of build_version_test
...
Bug: 230604501
Test: build/soong/soong_ui.bash --make-mode apexer_tools static_apexer_tools dist BUILD_HOST_static=1 USE_HOST_MUSL=true
Change-Id: I29b7f4c16346e39b89f099eecf816d9811a7b587
Merged-In: I29b7f4c16346e39b89f099eecf816d9811a7b587
2022-04-28 14:18:59 +00:00
Treehugger Robot
1b50e80f92
Merge "Replace DEX_FLAGS by flags for D8 and R8." am: d5a57a5679
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059767
Change-Id: I43703b2d2fbbdfe5094c8d1a396789d985e61fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:12:18 +00:00
Treehugger Robot
d5a57a5679
Merge "Replace DEX_FLAGS by flags for D8 and R8."
2022-04-28 12:40:13 +00:00
Ulya Trafimovich
91f015e73e
Correctly serialize class loader context for "any" SDK version to JSON.
...
Previously "any" was serialized as its numeric value, 10000. But other
code in makefiles and scripts expects string "any", and dexpreopt.config
files generated by Make (for Android.mk modules) have "any" not 10000.
Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
&& adb wait-for-device && adb root \
&& adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
# empty output, no errors at boot
Change-Id: Id5e80eb8a90d9786b5cb999c172aaecb44952f76
2022-04-28 13:22:52 +01:00
Ulya Trofimovich
c58470bc37
Merge "Remove obsolete dexpreopt config option UseArtImage." am: a465e28bcb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069027
Change-Id: I4713930b22cd10ab83d10472ee86600bbec2d249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 10:09:03 +00:00
Ulya Trofimovich
a465e28bcb
Merge "Remove obsolete dexpreopt config option UseArtImage."
2022-04-28 09:44:21 +00:00
Inseob Kim
5eb7ee9fad
Prototype changes for multitree
...
This change contains a prototype implementation for multitree. Several
interfaces and modules are added.
1. Imported/Exported
Modules implementing Exportable interface can export artifacts to other
components. "imported_filegroup" modules can import generated artifacts from other exported modules.
2. Multitree metadata
It contains information about imported/exported modules in each
component, and can be generated via "m update-meta".
3. cc library stub
It's based on prototype stub libraries. It uses imported/exported
mechanism to expose a C API, with a map.txt file and header files.
Bug: 230448564
Test: m
Change-Id: Id7ff7618e2c630c5617a564d8b23b60a1cc9c8e8
2022-04-28 08:20:10 +00:00
Treehugger Robot
587f8c3425
Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" am: fcf0b686aa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072628
Change-Id: I58c5e93cf87d607289991e18f1478cc6ef04484f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 23:12:57 +00:00
Treehugger Robot
fcf0b686aa
Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"
2022-04-27 22:10:36 +00:00
Cole Faust
8b7f627f30
Fix erroneous "Field requires API level 33 (current min is 32)" warnings
...
Bug: 215567981
Bug: 204776549
Test: m out/soong/.intermediates/frameworks/base/framework-minus-apex/android_common/lint/lint-report.xml, then check that that file doesn't have any of these warnings
Change-Id: I39aa2228474630c93250bf5833ac6bd9bbadcc7f
2022-04-27 12:20:08 -07:00
Kousik Kumar
b018b83664
Add a warning message about missing gcert at the end of the build
...
Now that we are ready to rollout gcert, adding a warning that builds
will fail if gcert doesn't exist. Doing this only for builds with
ANDROID_BUILD_ENVIRONMENT_CONFIG=googler.
Test: Ran a build without gcert and USE_RBE=true and it printed the
warning.
Bug: b/229743321
Change-Id: I616a4a534ab277873ac7e19baecb78620f07854c
2022-04-27 15:16:41 -04:00
Trevor Radcliffe
2ca964ecda
Merge "Refactor cc/bp2build.go to use parse helper" am: 4dc57a6d7b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072288
Change-Id: Ib5980bf23cea4f8663da6c665c50dea288805d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 19:10:20 +00:00
Trevor Radcliffe
4dc57a6d7b
Merge "Refactor cc/bp2build.go to use parse helper"
2022-04-27 18:40:00 +00:00
Cole Faust
dcc5e4c832
Merge "Ignore assignments to .KATI_READONLY" am: a59059f3a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076913
Change-Id: Ic3c1e38c2139aea9d7255abc4e54eeb0dbe7a9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:01:24 +00:00
Liz Kammer
7df48d0702
Merge "Delete some unused functions." am: eb5fc70c7b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075898
Change-Id: Ibc87c660a4cf639216ba60c0b9cd24954d327924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:01:14 +00:00
Cole Faust
a59059f3a1
Merge "Ignore assignments to .KATI_READONLY"
2022-04-27 17:56:54 +00:00
Liz Kammer
eb5fc70c7b
Merge "Delete some unused functions."
2022-04-27 17:36:09 +00:00
Muhammad Haseeb Ahmad
5b63f52025
Merge "Add jni support to java_fuzz_host" am: 4e70b7586a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045705
Change-Id: Ia5971f11a607df9d214469a133db41d0c7c0d83d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 17:29:03 +00:00
Treehugger Robot
37ce89c599
Merge "Share CreateModule between hooks & mutators" am: 60fe34a79d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075728
Change-Id: Ib6925aed43ba905a8561a6075c5ad86f3edb1261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 17:27:49 +00:00
Treehugger Robot
5c02379a49
Merge "Deduplicate classLoaderContexts field between two structs." am: b3f437ae7b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077658
Change-Id: I816fed511a13ef12406655caa717e21353606a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 17:25:40 +00:00
Muhammad Haseeb Ahmad
4e70b7586a
Merge "Add jni support to java_fuzz_host"
2022-04-27 16:14:29 +00:00
Treehugger Robot
60fe34a79d
Merge "Share CreateModule between hooks & mutators"
2022-04-27 16:00:35 +00:00
Treehugger Robot
b3f437ae7b
Merge "Deduplicate classLoaderContexts field between two structs."
2022-04-27 14:53:14 +00:00
Treehugger Robot
36a65aaaba
Merge "Add buildinfo_prop module" am: 266cf08ac6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073592
Change-Id: Ia5f646a47069a02d279b330aae6299884bdf9c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 13:27:17 +00:00
Treehugger Robot
266cf08ac6
Merge "Add buildinfo_prop module"
2022-04-27 13:00:36 +00:00
Ulya Trafimovich
442ec7fc07
Remove obsolete dexpreopt config option UseArtImage.
...
Bug: 170935728
Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd
Change-Id: Id83b9085794fd2ec338077ca909f84e04ccad041
2022-04-27 13:36:47 +01:00
Jingwen Chen
b47d59ac7c
bp2build: Denylist new module that has a dependency on unconverted go binaries. am: c172816439
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076206
Change-Id: If5cad1a0022d0830b13b6c5fdc3a7ad4652c1b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 12:31:31 +00:00
Ulya Trafimovich
12164ded20
Deduplicate classLoaderContexts field between two structs.
...
This field is provided by the `dexpreopter` struct, which is a part of
`java.Module` and also had an identially named field. This created
confusion when the latter field was not properly copied into the former,
which resulted in not propagating class loader context, e.g. for static
library "androidx.preference_preference". This didn't cause class loader
context mismatch errors at boot previously, because the library didn't
have any uses-library dependencies before a recent prebuilt update.
Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
&& adb wait-for-device && adb root \
&& adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
# empty output, no errors at boot
Change-Id: Ib818c5d2934d28817bb7a04b6114ae8b82a5c04d
2022-04-27 11:59:34 +01:00
Jingwen Chen
c172816439
bp2build: Denylist new module that has a dependency on unconverted go binaries.
...
Test: CI
Change-Id: I2763d3371f32850732303110fc13a5b44a4f14fe
2022-04-27 09:56:33 +00:00