Commit Graph

56647 Commits

Author SHA1 Message Date
Treehugger Robot
62803617c5 Merge "Replace DEX_FLAGS by flags for D8 and R8." am: d5a57a5679 am: 1b50e80f92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059767

Change-Id: I6843e40400b06f971ce2f5d152d667774f5f603d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:04 +00:00
Ulya Trofimovich
340fa7cca8 Merge "Remove obsolete dexpreopt config option UseArtImage." am: a465e28bcb am: c58470bc37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069027

Change-Id: I715de13e60f746c9e5be2433116a727783af9007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:44 +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
Oriol Prieto Gasco
d6db5357e6 Merge "Set the dist dir for musl targets of build_version_test" into tm-dev am: 557e3fa4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17982168

Change-Id: Iee4b398f715ae6c39b1d244b9fdad618190647a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 13:11:45 +00:00
Treehugger Robot
d5a57a5679 Merge "Replace DEX_FLAGS by flags for D8 and R8." 2022-04-28 12:40:13 +00:00
Oriol Prieto Gasco
557e3fa4a6 Merge "Set the dist dir for musl targets of build_version_test" into tm-dev 2022-04-28 12:17:41 +00: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
Treehugger Robot
35e5179349 Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" am: fcf0b686aa am: 587f8c3425
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072628

Change-Id: I7cc60174e9e525181cbf51dfd20e2e3e89f5c241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 23:30:58 +00:00
TreeHugger Robot
d8715db0ae Merge "Bump minimum minSdkVersion to 19." into tm-dev am: 8fc3fa09fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17944288

Change-Id: I375e255065bdc20f7116e08a77cfef1448fdbcc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 23:13:13 +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
TreeHugger Robot
8fc3fa09fa Merge "Bump minimum minSdkVersion to 19." into tm-dev 2022-04-27 22:05:18 +00:00
Trevor Radcliffe
9fb1e99a08 Merge "Refactor cc/bp2build.go to use parse helper" am: 4dc57a6d7b am: 2ca964ecda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072288

Change-Id: Iccb0fbd53e97bf6ecec7e01d720ca0ceb5fb76a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:00:51 +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
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
e4783cac3e Merge "Ignore assignments to .KATI_READONLY" am: a59059f3a1 am: dcc5e4c832
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076913

Change-Id: I08b95673fe8e890effad8be65a56074a1f7c15f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:38:04 +00:00
Liz Kammer
d71a590b75 Merge "Delete some unused functions." am: eb5fc70c7b am: 7df48d0702
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075898

Change-Id: Ie321a52c68529813f5f07e485e3b9055d1b7ec6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:37:17 +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
Muhammad Haseeb Ahmad
809cd79d01 Merge "Add jni support to java_fuzz_host" am: 4e70b7586a am: 5b63f52025
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045705

Change-Id: I3b9da743e9cf88e8defdb6610630e37a8bfa46b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:56:23 +00:00
Treehugger Robot
7aa2ab4257 Merge "Share CreateModule between hooks & mutators" am: 60fe34a79d am: 37ce89c599
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075728

Change-Id: I180f522c5fd7bef9fd6bcff2af9ee9aa5a2f7dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:53:12 +00:00
Treehugger Robot
f7814a1ccb Merge "Deduplicate classLoaderContexts field between two structs." am: b3f437ae7b am: 5c02379a49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077658

Change-Id: I5f74c22213d7b84b5d1c2fefff18e26d1285384f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:53:01 +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
Yi Kong
a1886d1deb [automerger skipped] Merge "Update to clang-r450784d" into tm-dev am: b5abdaef42 -s ours
am skip reason: Merged-In I322a680cdc6ebc0f1fe3735ed087477e7f2508fe with SHA-1 a126c63042 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17956593

Change-Id: I6918a4d59f754d078cee2e01c7ddded1cbcbaeda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:27:42 +00:00
Yi Kong
598c6ca3e9 [automerger skipped] Update to clang-r450784d am: db7e0ceb2f -s ours
am skip reason: Merged-In I322a680cdc6ebc0f1fe3735ed087477e7f2508fe with SHA-1 a126c63042 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17956593

Change-Id: I10e0cb2c2ba0e0b4356f1bf9a2d84838fe9079b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:27:40 +00:00
Jingwen Chen
3decb36e0d [automerger skipped] Append APEX version instead of build ID for APK-in-APEX paths. am: 3b1dcf4f46 -s ours
am skip reason: Merged-In I9cef1418c3fc7e0970d96995b8398f5e82f479e0 with SHA-1 6cb124b8d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17944887

Change-Id: Ibe6af57ae8071c512f85ecadfc263cab684b3084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:27:01 +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
Yi Kong
b5abdaef42 Merge "Update to clang-r450784d" into tm-dev 2022-04-27 16:54:06 +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
Oriol Prieto Gasco
92e3e4fbf6 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
2022-04-27 15:32:48 +00:00
Treehugger Robot
b3f437ae7b Merge "Deduplicate classLoaderContexts field between two structs." 2022-04-27 14:53:14 +00:00
Treehugger Robot
57179b8d38 Merge "Add buildinfo_prop module" am: 266cf08ac6 am: 36a65aaaba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073592

Change-Id: Ia98c5bfe897a0e1f9719fd718a34de621006ef9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 13:50:51 +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
Jingwen Chen
71420e9761 bp2build: Denylist new module that has a dependency on unconverted go binaries. am: c172816439 am: b47d59ac7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076206

Change-Id: I6b147e7377046b89b153f0b55fe607377bc1d102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 13:03:04 +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
Inseob Kim
4f1f3d97ca Add buildinfo_prop module
buildinfo_prop module is a replacement for build/make/tools/buildinfo.sh
so other images like microdroid can refer to build.prop.

For now, buildinfo_prop only supports a few build.prop properties, and
it's only used in microdroid.

Bug: 189164487
Test: build
Change-Id: I120654ca23a68de414df8da2051c6677afbab441
2022-04-27 14:10:52 +09:00
Cole Faust
c8f9c90265 Merge "Ignore variable assignments that come after a rule definition" am: 9948d09b0c am: 8b89acba26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076880

Change-Id: Ia231cecb5cf97214d6e2faaaf4115e10635843c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:29:30 +00:00
Cole Faust
8b89acba26 Merge "Ignore variable assignments that come after a rule definition" am: 9948d09b0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076880

Change-Id: I9e7777b829421753ec4aced90d85b2245951b6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 04:04:01 +00:00
Cole Faust
9948d09b0c Merge "Ignore variable assignments that come after a rule definition" 2022-04-27 03:43:02 +00:00
Treehugger Robot
0963f95b61 Merge changes I8ef31373,Ic408857d am: 7cb3f50fda am: 143af5947d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072577

Change-Id: I5370568a1abe5f1aad58c1f8cc4c15a44742a377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 01:43:24 +00:00