Commit Graph

56825 Commits

Author SHA1 Message Date
Treehugger Robot
eb89a79400 Merge "Revert "Don't add uses_libs/optional_uses_libs to the manifest_fixer."" am: be4c7eda08 am: b20002cdeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085466

Change-Id: Ibc412099ec92bee26dc33c63f978e0ba14da9b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:38:28 +00:00
Treehugger Robot
b20002cdeb Merge "Revert "Don't add uses_libs/optional_uses_libs to the manifest_fixer."" am: be4c7eda08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085466

Change-Id: I39902680824b4a44cf9900112bb062076e7a9b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 15:49:37 +00:00
Treehugger Robot
be4c7eda08 Merge "Revert "Don't add uses_libs/optional_uses_libs to the manifest_fixer."" 2022-05-04 15:19:37 +00:00
Lukács T. Berki
2737d91393 Merge "Add a test for correctness of C++ compilation." am: 28ba9c472f am: 35c8481ffd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083443

Change-Id: Iabcc5918f0bcc6904ff5cf7e4daa0eae4a9f3916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:29:03 +00:00
Lukács T. Berki
35c8481ffd Merge "Add a test for correctness of C++ compilation." am: 28ba9c472f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083443

Change-Id: Ie8248832417b9a61a176b1a1268b737f0b3924c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:04:42 +00:00
Lukács T. Berki
28ba9c472f Merge "Add a test for correctness of C++ compilation." 2022-05-04 12:06:38 +00:00
Ulya Trafimovich
f5d91bb3b4 Revert "Don't add uses_libs/optional_uses_libs to the manifest_fixer."
This reverts commit 0b1c70efbc.

The reverted commit was based on the idea that uses-libraries that are
explicitly specified in build files should not be implicitly added to
the manifest, as that would mean that anything added to the build files
will flow to the manifest.

Although this logic is correct, it prevents propagation of
uses-libraries from dependencies, which is wrong: if a library has an
explicit uses-library property in Android.bp, this property is expected
to be propagated to the library's dependencies. Failing to do so would
mean that every user of that library has to add uses-library property to
their build files, which doesn't scale (see b/214255490 for example).

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: I6f420e76a89aa2f37be99f877711736640f2c361
2022-05-04 12:10:06 +01:00
Lukacs T. Berki
e3487c8848 Add a test for correctness of C++ compilation.
This required the following:

- Adding Platform_base_sdk_extension_version to default soong.variables
- Teaching the symlink tree creation code to understand symlinks
- Making finder.go follow symlinks when requested

Adding yet another knob is unfortunate, but I can't allow that
unconditionally because the Android code base contains a number of
symlinks giving rise to infinite directory trees because they point back
to their parent and this seemed preferable to adding complicated logic
like "follow symlink but if only its fully resolved version does not
point under the source tree".

I could be convinced about the latter, though.

Test: Presubmits.
Change-Id: I453f6b7e5334771f5832c700db00f9d24ed1d82f
2022-05-04 09:12:01 +02:00
Ge Bian
4eeecd09d6 Merge "Revert "Add support to max-target-s to generate_hiddenapi_lists"" am: d906ddc70a am: 6de137b6de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086403

Change-Id: I27fbbe0f7dde18b937dd741b71c450aa37d3d61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:37:36 +00:00
Ge Bian
6de137b6de Merge "Revert "Add support to max-target-s to generate_hiddenapi_lists"" am: d906ddc70a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086403

Change-Id: Ice0f1043761214ff8120a09098708ff344b2d173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:47:13 +00:00
Ge Bian
d906ddc70a Merge "Revert "Add support to max-target-s to generate_hiddenapi_lists"" 2022-05-03 23:04:00 +00:00
Mark Dacek
87989eed0f Merge "Log information for Mixed Builds modules. Test: Output matches expected. https://paste.googleplex.com/5913495636803584?raw Performance evaluated: https://docs.google.com/spreadsheets/d/1X7eOVBKEZUwUWl5i8CDfBo9yUeZrDPXWi2JYO4BEZt4/edit?resourcekey=0-co8crIFW9dpiedhCMkhAgw#gid=0" am: 390df4c181 am: f06d0af87d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072287

Change-Id: I2da415e45f8feb50ee219e01d3247bc33e6ac441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 22:00:01 +00:00
Ge Bian
93b542459a Revert "Add support to max-target-s to generate_hiddenapi_lists"
Revert submission 1931011-max-target-s

Reason for revert: Seems to cause build breakage
Reverted Changes:
I2b513f93a:Add support to max-target-s to generate_hiddenapi_...
Ifdd7b7a71:Add support for max-target-s
I06d05840e:Add support for max-target-s

Change-Id: I67413a3deda42c503b876727377e932f7e4652e9
2022-05-03 20:41:53 +00:00
Mark Dacek
f06d0af87d Merge "Log information for Mixed Builds modules. Test: Output matches expected. https://paste.googleplex.com/5913495636803584?raw Performance evaluated: https://docs.google.com/spreadsheets/d/1X7eOVBKEZUwUWl5i8CDfBo9yUeZrDPXWi2JYO4BEZt4/edit?resourcekey=0-co8crIFW9dpiedhCMkhAgw#gid=0" am: 390df4c181
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072287

Change-Id: I94232873db7268e6ecfdb8eb99db5ffc016affed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:31:42 +00:00
Treehugger Robot
9d19cc9c47 Merge "Add cross-referencing support for Rust" am: dd58c3fe2b am: f958126492
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835895

Change-Id: I29852c4e1cbe1e2f74c8a1c3ea4bb706fe92da38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:07:31 +00:00
Mark Dacek
390df4c181 Merge "Log information for Mixed Builds modules. Test: Output matches expected. https://paste.googleplex.com/5913495636803584?raw Performance evaluated: https://docs.google.com/spreadsheets/d/1X7eOVBKEZUwUWl5i8CDfBo9yUeZrDPXWi2JYO4BEZt4/edit?resourcekey=0-co8crIFW9dpiedhCMkhAgw#gid=0" 2022-05-03 20:04:10 +00:00
Treehugger Robot
f958126492 Merge "Add cross-referencing support for Rust" am: dd58c3fe2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835895

Change-Id: I13733c937a59338cf42395faaa6a1c16894ea378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:35:38 +00:00
Colin Cross
6e367367fd [automerger skipped] Add missing dependency on compose plugin in kapt rules am: dddb402c02 -s ours
am skip reason: Merged-In I4c2cf30fb7d8cad4eededa29f67f4ffd459caa41 with SHA-1 08b0a1cd79 is already in history

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

Change-Id: I3884932f09639ed2927782398c744eaab7bd6d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:18:36 +00:00
Treehugger Robot
dd58c3fe2b Merge "Add cross-referencing support for Rust" 2022-05-03 19:10:17 +00:00
Artur Satayev
abdcda51e2 Merge "Add support to max-target-s to generate_hiddenapi_lists" am: 4df5f992e3 am: 6e43d8126a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1952026

Change-Id: I3052017ed9c5637c6b53a1300166fcd74fa34a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:19:26 +00:00
MarkDacek
ff851b83b6 Log information for Mixed Builds modules.
Test: Output matches expected. https://paste.googleplex.com/5913495636803584?raw
Performance evaluated: https://docs.google.com/spreadsheets/d/1X7eOVBKEZUwUWl5i8CDfBo9yUeZrDPXWi2JYO4BEZt4/edit?resourcekey=0-co8crIFW9dpiedhCMkhAgw#gid=0

Change-Id: I88780c7cc52a189a72216c5e2e499c96574b3731
2022-05-03 18:11:32 +00:00
Artur Satayev
6e43d8126a Merge "Add support to max-target-s to generate_hiddenapi_lists" am: 4df5f992e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1952026

Change-Id: I8bd3b34cd861a2a77bc1f14b4585d2985cdb848c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:52:33 +00:00
Artur Satayev
4df5f992e3 Merge "Add support to max-target-s to generate_hiddenapi_lists" 2022-05-03 17:28:38 +00:00
Colin Cross
dddb402c02 Add missing dependency on compose plugin in kapt rules
The kapt rule uses kotlincFlags but was not using kotlincDeps,
causing the rule to get the -Xplugin argument on the compose
compiler plugin jar, but not have a dependency on it.

Bug: 231222079
Test: TestKotlinCompose
Change-Id: I4c2cf30fb7d8cad4eededa29f67f4ffd459caa41
(cherry picked from commit 08b0a1cd79)
Merged-In: I4c2cf30fb7d8cad4eededa29f67f4ffd459caa41
2022-05-03 17:07:27 +00:00
Paul Duffin
fe1d42a716 [automerger skipped] Prevent non-app/non-test modules from statically including jacocoagent am: 0038a8d374 am: 31cdf29eb1 -s ours
am skip reason: Merged-In Ic95cf11a05f59b67e623474ed3dd9be6b4442c42 with SHA-1 3953153c9e is already in history

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

Change-Id: Ib0fac9782fd3e682c8b315c545063d3a9e26878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:57:54 +00:00
Paul Duffin
31cdf29eb1 Prevent non-app/non-test modules from statically including jacocoagent am: 0038a8d374
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085343

Change-Id: Id262b6e9e63a621b952988f9668603a79e663daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:30:30 +00:00
Treehugger Robot
3c11108c46 Merge "Clean up minSdkVersionAllowlist" am: a0bab18a47 am: 6c356f40a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083104

Change-Id: I2c3cd50ffc0dfca954f616b677c831f7caa76d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:23:15 +00:00
Paul Duffin
4c35ba0de1 Merge "Prevent non-app/non-test modules from statically including jacocoagent" into tm-dev am: fe45ae8feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18133382

Change-Id: I5dc7aa3dca9acbf673dbbd049bfe5ff720655b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:21:57 +00:00
Paul Duffin
0038a8d374 Prevent non-app/non-test modules from statically including jacocoagent
(cherry picked from commit 3953153c9e)

Previously, the .impl library of java_sdk_library modules would end up
with the jacocoagent statically included. That is because their
Instrument flag was set to true when created by their parent. As that
was before the deps were added that meant that they ended up with a
static dependency on jacoagent (at least when UnbundledBuild() was
true).

That was not previously a problem because the .impl files were only
used at build time. However, a recent change to make updatable-media
statically include framework-media.impl (which statically included the
jacocoagent classes) broke the coverage build because the jacocoagent
classes are not in the permitted packages for the updatable-media.

When instrumenting the bootclasspath the jacocoagent library is added
to the art-bootclasspath-fragment.

The jacocoagent should only be statically included in apps, or test
apps. This change adds an extra flag to specify whether the module type
supports statically including the jacocoagent. This is set to true by
apps and test apps but not when the java_sdk_library creates the .impl
java_library preventing it from statically including jacocoagent.

Bug: 230967146
Bug: 229932396
Test: COVERAGE_MODULES=media \
      PRODUCT=mainline_modules_x86 \
      TARGET_BUILD_APPS=com.google.android.media \
      vendor/google/build/build_unbundled_coverage_mainline_module.sh
      # Fails without this change, passes with it.
Merged-In: Ic95cf11a05f59b67e623474ed3dd9be6b4442c42
Change-Id: Ic95cf11a05f59b67e623474ed3dd9be6b4442c42
2022-05-03 10:11:59 +00:00
Paul Duffin
fe45ae8feb Merge "Prevent non-app/non-test modules from statically including jacocoagent" into tm-dev 2022-05-03 10:07:55 +00:00
Treehugger Robot
6c356f40a2 Merge "Clean up minSdkVersionAllowlist" am: a0bab18a47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083104

Change-Id: I9c72ff7ada368c987453e689e9f8bd427c41ca99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:25:23 +00:00
Treehugger Robot
a0bab18a47 Merge "Clean up minSdkVersionAllowlist" 2022-05-03 09:00:15 +00:00
Treehugger Robot
ef758eca54 Merge "Remove unused uses_sdks property for apexes" am: a6fcf9fd92 am: 9a37c9bb75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2071390

Change-Id: Icb6dec841f99bfafb4238255bf80934f6600d059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:52:36 +00:00
Treehugger Robot
d0ace6dffb Merge "Remove version_selector mutator" am: 7f5b4e3229 am: 09c23eb3b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060089

Change-Id: If216f7704bc6a3e56be329c1883545c4061e320e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:52:26 +00:00
Treehugger Robot
c45647c798 Merge "Add missing dependency on compose plugin in kapt rules" am: 6c59cdb5c7 am: 7a0e9509bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2084483

Change-Id: Ia854a3da32397f2dbfff756de500db781443595e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:52:00 +00:00
Treehugger Robot
9a37c9bb75 Merge "Remove unused uses_sdks property for apexes" am: a6fcf9fd92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2071390

Change-Id: Iab9d6f2841691b4cc31cf89512ff3a75de3ea8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:23:09 +00:00
Treehugger Robot
09c23eb3b0 Merge "Remove version_selector mutator" am: 7f5b4e3229
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060089

Change-Id: If6a21b33e7fcf3c9732b0220a15018114c9b5603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:48 +00:00
TreeHugger Robot
e8265bf65c [automerger skipped] Merge "Add buildinfo_prop module" into tm-dev am: a83d03c206 -s ours
am skip reason: Merged-In I120654ca23a68de414df8da2051c6677afbab441 with SHA-1 4f1f3d97ca is already in history

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

Change-Id: If9b4e34467630553e484c98c0d6580de4d037391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:48 +00:00
Inseob Kim
e43521c52b [automerger skipped] Add buildinfo_prop module am: c7c4746151 -s ours
am skip reason: Merged-In I120654ca23a68de414df8da2051c6677afbab441 with SHA-1 4f1f3d97ca is already in history

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

Change-Id: I58e35da011ec83867b1e33269efc94e1773c637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:44 +00:00
Yi Kong
1742f79f2e [automerger skipped] Update clang version to clang-r450784d am: b3089e8a20 -s ours
am skip reason: Merged-In If6c2c331044a363cb8f20a2516da894e72c4b7e7 with SHA-1 4f6c92765d is already in history

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

Change-Id: Ib70048c55d5b21ce87105c16e90d2088ef2f62fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:22:00 +00:00
Treehugger Robot
7a0e9509bc Merge "Add missing dependency on compose plugin in kapt rules" am: 6c59cdb5c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2084483

Change-Id: I89772b863d415df80eaae6ff3ea75c456d213182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:21:45 +00:00
TreeHugger Robot
a83d03c206 Merge "Add buildinfo_prop module" into tm-dev 2022-05-03 05:14:30 +00:00
Treehugger Robot
a6fcf9fd92 Merge "Remove unused uses_sdks property for apexes" 2022-05-03 03:24:59 +00:00
Treehugger Robot
7f5b4e3229 Merge "Remove version_selector mutator" 2022-05-03 03:06:57 +00:00
Treehugger Robot
6c59cdb5c7 Merge "Add missing dependency on compose plugin in kapt rules" 2022-05-03 02:28:14 +00:00
Paul Duffin
3953153c9e Prevent non-app/non-test modules from statically including jacocoagent
Previously, the .impl library of java_sdk_library modules would end up
with the jacocoagent statically included. That is because their
Instrument flag was set to true when created by their parent. As that
was before the deps were added that meant that they ended up with a
static dependency on jacoagent (at least when UnbundledBuild() was
true).

That was not previously a problem because the .impl files were only
used at build time. However, a recent change to make updatable-media
statically include framework-media.impl (which statically included the
jacocoagent classes) broke the coverage build because the jacocoagent
classes are not in the permitted packages for the updatable-media.

When instrumenting the bootclasspath the jacocoagent library is added
to the art-bootclasspath-fragment.

The jacocoagent should only be statically included in apps, or test
apps. This change adds an extra flag to specify whether the module type
supports statically including the jacocoagent. This is set to true by
apps and test apps but not when the java_sdk_library creates the .impl
java_library preventing it from statically including jacocoagent.

Bug: 230967146
Bug: 229932396
Test: COVERAGE_MODULES=media \
      PRODUCT=mainline_modules_x86 \
      TARGET_BUILD_APPS=com.google.android.media \
      vendor/google/build/build_unbundled_coverage_mainline_module.sh
      # Fails without this change, passes with it.
Change-Id: Ic95cf11a05f59b67e623474ed3dd9be6b4442c42
2022-05-03 00:46:55 +00:00
Tianyu Jiang
dde3f8eda1 Merge "Revert "Update to clang-r450784e"" am: 5ae0cd2a38 am: aaf74b0443
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083810

Change-Id: I6da5df2ec6cde975e401e958fcc72be000503cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:09:00 +00:00
Tianyu Jiang
aaf74b0443 Merge "Revert "Update to clang-r450784e"" am: 5ae0cd2a38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2083810

Change-Id: I14f867ad1b53adcb1f04c8b9e5a00ee4b940a77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:37:13 +00:00
Tianyu Jiang
5ae0cd2a38 Merge "Revert "Update to clang-r450784e"" 2022-05-02 23:14:38 +00:00
Tianyu Jiang
cc84ca767d Revert "Update to clang-r450784e"
Revert submission 2080443-update-clang-8508608

Reason for revert: b/230930120
Reverted Changes:
I678829f02:Update to clang-r450784e

Change-Id: I89e336ec1deffddbbbf872a3ee4a1082a65fb137
2022-05-02 23:06:49 +00:00