Commit Graph

51104 Commits

Author SHA1 Message Date
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
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
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
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
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
143af5947d Merge changes I8ef31373,Ic408857d am: 7cb3f50fda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072577

Change-Id: I5f2e8f2364f643fb91b617e9ada1bf75b762ebca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 01:19:07 +00:00
Cole Faust
5d5fcc3092 Ignore assignments to .KATI_READONLY
Since the rbc results file is sorted, .KATI_READONLY
ends up trying to make a variable that hasn't been defined
yet readonly, which is an error.

It's not really worth supporting moving it down in the list,
because it wouldn't affect the variable being writable while
still in Starlark code.

Bug: 226974242
Test: go test
Change-Id: I9402f69be97e5c7cf010ad86f124422ea55fda7f
2022-04-26 18:02:05 -07:00
Treehugger Robot
7cb3f50fda Merge changes I8ef31373,Ic408857d
* changes:
  Disable newapi check in defaults
  Enforce newapi check only if min_sdk_version < compile_sdk_version
2022-04-27 00:55:56 +00:00
Chih-hung Hsieh
9ef9536d76 Merge "add ALLOW_LOCAL_TIDY_TRUE and some tests" am: 863ebc3199
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2070069

Change-Id: Ic87c498f74b7107196dcbb29fea177d3003ffacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 00:47:40 +00:00
Chih-hung Hsieh
863ebc3199 Merge "add ALLOW_LOCAL_TIDY_TRUE and some tests" 2022-04-27 00:19:03 +00:00
Cole Faust
00afd4f8b9 Ignore variable assignments that come after a rule definition
These private variables sometimes have references to make
variables like $< or $@. When converted to starlark, they
become invalid local variables like _< and _@, preventing
the file from being loaded even if it's never executed.

Bug: 226974242
Test: go test
Change-Id: Iafd4c6939731f3b7c051c9e41464134d5b672f23
2022-04-26 14:01:56 -07:00
Chris Wailes
73df1938e3 Merge "Update RustDefaultVersion to 1.60.0" am: d0fba50d71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073969

Change-Id: I7ed29d08999b990772e48977da39349b264a6fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:00:21 +00:00
Chris Wailes
d0fba50d71 Merge "Update RustDefaultVersion to 1.60.0" 2022-04-26 20:37:34 +00:00
Chih-Hung Hsieh
104f51f70b add ALLOW_LOCAL_TIDY_TRUE and some tests
* A new ALLOW_LOCAL_TIDY_TRUE variable, default is false.
* If it is 0/false, local "tidy:true" is ignored.
* If it is 1/true, local "tidy:true" is honored as it is now.

Bug: 229779921
Test: make with and without ALLOW_LOCAL_TIDY_TRUE=1
Change-Id: I0323289a4d3bb2514982252a5a1339e94f2bbaab
2022-04-26 13:30:32 -07:00
Muhammad Haseeb Ahmad
7e74405b2d Add jni support to java_fuzz_host
Bug: 219782880
Test: m example_java_fuzzer_with_native_lib, go test -run TestJavaFuzz
Change-Id: I1d05fb449e5378a27a0096869d9c12ca0a1245c6
2022-04-26 18:49:02 +00:00
Liz Kammer
f31c90050c Share CreateModule between hooks & mutators
These contained duplicate code, but evolved separately in the effort to
identify module type of those created with CreateModule. This refactors
to share a common implementation between the two.

Test: m json-module-graph and verify Type fields
Test: CI
Change-Id: Ifdb9a006d9b1bef7411f9ce3a4384797693b4bfc
2022-04-26 09:08:55 -04:00
Christopher Parsons
b26d44c2fb Merge "Improve bazel action status mnemonics" am: be9b9deef9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1992270

Change-Id: Ib2168f752b3e9aa43198feadb9ca70c0d6f0a3af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 21:12:08 +00:00
Christopher Parsons
be9b9deef9 Merge "Improve bazel action status mnemonics" 2022-04-25 20:57:17 +00:00
Liz Kammer
c2554b6df2 Delete some unused functions.
Test: cc soong tests
Change-Id: Ifa60cdd19aa9151656a6a9df295fe42ec1d8fd46
2022-04-25 16:00:17 -04:00
Treehugger Robot
fe7dfae4d0 Merge "Update to clang-r450784d" am: e1d067b529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2074438

Change-Id: Ib6ab29849d36b0d81d24c72a8dc1ed17ebcfacc8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:50:50 +00:00
Treehugger Robot
e1d067b529 Merge "Update to clang-r450784d" 2022-04-25 18:21:38 +00:00
Spandan Das
397e910835 Disable newapi check in defaults
- Making newapi disabled by default will ensure that this lint check
  does not run on the platform. This prevents noisy lint warnings like b/228956345#1
- This lint check will continue to be enforced on the transitive deps of
  apexes, since lint.strict_updatability_linting will be true for those
  Soong modules

Test: TH
Test: m
out/soong/.intermediates/frameworks/base/services/core/services.core.unboosted/android_common/lint/lint-report.xml
// file no longer contains "Call requires API level ..." warning
Bug: 228956345

Change-Id: I8ef3137394011fb679a1129f80f6351fb05a4eff
2022-04-25 18:17:11 +00:00
Spandan Das
ba7e532a11 Enforce newapi check only if min_sdk_version < compile_sdk_version
- NewApi check should be enforced only if min_sdk_version is less than
  the compile_sdk_version (the opposite direction should be a different
  build-time error)
- Change the datatype of *sdkVersion to android.ApiLevel (from string)
  to support version comparisons

Test: go build ./java
Test: no changes in ninja file
Bug: 228956345

Change-Id: Ic408857db7760d912ef4694d2ed72c0b7106eb04
2022-04-25 18:12:50 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
ca92d5fdbf Handle cc_defaults' shared for cc_library_shared am: 126bd58e72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2071427

Change-Id: I193b781ae3cde4128203f7583a54384b71a7983e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:32:32 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
126bd58e72 Handle cc_defaults' shared for cc_library_shared
Akin to testing for cc_defaults' `static`, we introduce
a `shared` sibling to
TestStaticLibrary_SystemSharedLibsStaticEmpty

Bug: 195451854
Test: TestCcLibrarySharedSystemSharedLibsSharedEmpty
Change-Id: I63cb0641d216e8c11586ecf415fa2441e31dd3e5
2022-04-25 17:24:33 +00:00
Martin Stjernholm
d84655e3bd Merge "Skip linux_bionic by default in the build tests." am: e559b1f5ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065007

Change-Id: I79977eac4dc69027c3172ef999dd9e715e77f1bc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:23:09 +00:00
Martin Stjernholm
e559b1f5ff Merge "Skip linux_bionic by default in the build tests." 2022-04-25 16:54:49 +00:00
Jingwen Chen
4eb789da50 Merge "Append APEX version instead of build ID for APK-in-APEX paths." am: d21a8a5a42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2067907

Change-Id: I342d7e860d603d763c8f2f000c798e6c45607208
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 12:08:49 +00:00
Jingwen Chen
d21a8a5a42 Merge "Append APEX version instead of build ID for APK-in-APEX paths." 2022-04-25 11:45:46 +00:00