Commit Graph

56609 Commits

Author SHA1 Message Date
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
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
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
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
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
Chih-hung Hsieh
2b9eba93c9 Merge "add ALLOW_LOCAL_TIDY_TRUE and some tests" am: 863ebc3199 am: 9ef9536d76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2070069

Change-Id: I3c7c8f50e41be7360886c1a11e07a0049889a0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 01:11:59 +00: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
Chris Wailes
fadea48f71 Merge "Update RustDefaultVersion to 1.60.0" am: d0fba50d71 am: 73df1938e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073969

Change-Id: I926532e418e7effbc84e4e78e9383207557ddb8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:15:55 +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
Yi Kong
db7e0ceb2f Update to clang-r450784d
This respin contains performance improvements to clang-tidy and lld, and
fp16 cost fixes.

Test: presubmit
Bug: 219872481
Change-Id: I322a680cdc6ebc0f1fe3735ed087477e7f2508fe
(cherry picked from commit a126c63042)
Merged-In: I322a680cdc6ebc0f1fe3735ed087477e7f2508fe
2022-04-26 16:45:34 +00:00
Jingwen Chen
3b1dcf4f46 Append APEX version instead of build ID for APK-in-APEX paths.
This CL removes the build_id.mk suffix and replaces it with a hardcoded
placeholder string that will be replaced with the actual version in
apex_manifest.json by apexer at apex construction time.

This means that as long as the apex version is incremented, the
APK-in-APEX will be installed to a new directory path from the package
manager's perspective.

Fixes: 229574810
Bug: 229625490
Bug: 226559955
Bug: 224589412
Bug: 227417611
Bug: 228157333
Bug: 228803590
Bug: 229136249

Test: atest StrictJavaPackagesTest
Test: soong tests
Test: deapexer list out/dist/com.google.android.permission.apex
Ignore-AOSP-First: this is an cherrypick
Change-Id: I9cef1418c3fc7e0970d96995b8398f5e82f479e0
Merged-In: I9cef1418c3fc7e0970d96995b8398f5e82f479e0
2022-04-26 12:54:50 +00:00
Christopher Parsons
5bdf7b4426 Merge "Improve bazel action status mnemonics" am: be9b9deef9 am: b26d44c2fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1992270

Change-Id: I4c5f900917aaba20c2ea9ecfff5bc1731b16646e
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:29:04 +00: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
Treehugger Robot
168b8dbbb0 Merge "Update to clang-r450784d" am: e1d067b529 am: fe7dfae4d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2074438

Change-Id: I08e3482d5c6a14901994d6f83243db1d7b7ed3ea
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:08:24 +00: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
6b1ec27ccb Handle cc_defaults' shared for cc_library_shared am: 126bd58e72 am: ca92d5fdbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2071427

Change-Id: I0ad35cb59cc8f87379ea95bbbcf374bf55bd8d73
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:50:47 +00:00
Martin Stjernholm
4ad28f1e85 Merge "Skip linux_bionic by default in the build tests." am: e559b1f5ff am: d84655e3bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065007

Change-Id: Ib4f9df19917a6ac3572baa99bc31d52ebe7d2694
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:50:28 +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
97fbc24443 Merge "Append APEX version instead of build ID for APK-in-APEX paths." am: d21a8a5a42 am: 4eb789da50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2067907

Change-Id: Ib5c681d03dc12c5f4839b810b79ef4800235ea30
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:41:18 +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
Yi Kong
a126c63042 Update to clang-r450784d
This respin contains performance improvements to clang-tidy and lld, and
fp16 cost fixes.

Test: presubmit
Bug: 219872481
Change-Id: I322a680cdc6ebc0f1fe3735ed087477e7f2508fe
2022-04-24 12:40:02 +08:00
Treehugger Robot
e0a1f2edf8 Merge "Fix error message formatting" am: 224879e794 am: 16991b22ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073767

Change-Id: I65e7cf023c69ab37e512bb7d25e4979ee41639cb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 12:57:36 +00:00