Commit Graph

56844 Commits

Author SHA1 Message Date
Treehugger Robot
171991c36a Merge "Treat kotlin-annotations the same as kotlin-stdlib" am: a11603a538 am: f0e3ea0b88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086464

Change-Id: I98171585a4369716fdd620c4ed9f133300b9cb8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 17:55:15 +00:00
Treehugger Robot
f0e3ea0b88 Merge "Treat kotlin-annotations the same as kotlin-stdlib" am: a11603a538
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086464

Change-Id: I0329b8c4553b19583739a4bf276a20d2e92a8bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 17:29:29 +00:00
Treehugger Robot
a11603a538 Merge "Treat kotlin-annotations the same as kotlin-stdlib" 2022-05-06 17:00:08 +00:00
Artur Satayev
56b712d6a8 Add support to max-target-s to generate_hiddenapi_lists am: 9f2bcac707
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18163771

Change-Id: I4114582114e7a794513d10350bdcd55a21066de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:14:00 +00:00
Artur Satayev
9f2bcac707 Add support to max-target-s to generate_hiddenapi_lists
Test: make
Bug: 169748350
Change-Id: I2662a643a190ed531d85755d01e1be9c49c02e25
Merged-In: I2662a643a190ed531d85755d01e1be9c49c02e25
2022-05-06 08:58:24 +00:00
Treehugger Robot
32b22ed6e1 Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" am: beccdcdff2 am: da3367e8cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2087883

Change-Id: Icf30af7b6fe6e1a6e6043bfe38f522ca3c0a9245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:01:12 +00:00
Treehugger Robot
da3367e8cf Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" am: beccdcdff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2087883

Change-Id: I9fe61f478d52a2118bb10d35bd9b8d5178208089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:12 +00:00
Treehugger Robot
beccdcdff2 Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" 2022-05-06 03:17:24 +00:00
David Brazdil
d5a957abcd fs: Add raw_binary rule am: 08f7eadcee am: c1c2871fc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075038

Change-Id: I5eaa9a41d5b9ec0c942787c5176ca23159569912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:00:36 +00:00
David Brazdil
c1c2871fc8 fs: Add raw_binary rule am: 08f7eadcee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075038

Change-Id: I5fc2083589c991241ade7e04fae3b47d999a4a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 01:43:37 +00:00
David Brazdil
08f7eadcee fs: Add raw_binary rule
Raw binaries are used in bare-metal environments such as early boot of
pVMs (protected virtual machines). Add a new target rule called
'raw_binary' which converts an executable to the raw binary format.

Test: m pvmfw
Change-Id: I701b703a0f12df891b714fe29e320914f167cd04
2022-05-05 18:46:39 +01:00
David Brazdil
9814b83996 Add linker_scripts property am: 958c957696 am: b6c3de2689
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073768

Change-Id: I0ef2c0218d1dedee702f15e1fb154d111f077182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 17:39:46 +00:00
David Brazdil
530ba0cd3e Fix typo in installer.go am: 3eb5a74a26 am: 0ddc067f16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076519

Change-Id: I55b3d9acbcd88988fc553204f91b47608b8c0eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 17:39:42 +00:00
David Brazdil
b6c3de2689 Add linker_scripts property am: 958c957696
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073768

Change-Id: I419295585abb0180f7e6555aa0351184745036ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:53:18 +00:00
David Brazdil
0ddc067f16 Fix typo in installer.go am: 3eb5a74a26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076519

Change-Id: I54bfc39afae59ab6ce2c589cbc420883c2efecd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:53:15 +00:00
David Brazdil
958c957696 Add linker_scripts property
Add a linker_scripts property that is similar to version_script
but uses a -Wl,--script flag and can be passed multiple times.

Test: TestBinaryLinkerScripts
Change-Id: If405cfbcdaf8e99559414ba759734084fae0f7ec
2022-05-05 16:36:56 +01:00
David Brazdil
3eb5a74a26 Fix typo in installer.go
Test: builds
Change-Id: I51364616e2a16f932d34ef33565d04a00d8f4ca5
2022-05-05 16:36:56 +01:00
Oriol Prieto Gasco
17e2290e9f Revert "Append APEX version instead of build ID for APK-in-APEX ..."
Revert submission 2067907-apk-in-apex

Bug: 230873680

Reason for revert: Change broke aab generation b/230873680
Reverted Changes:
I9cef1418c:Append APEX version instead of build ID for APK-in...
Ic37eeba8b:Make apexer replace instances of version placehold...

Change-Id: Ib113d56901e815435f71bf878049cdabd210503c
2022-05-05 14:32:37 +00:00
Colin Cross
063544747e Treat kotlin-annotations the same as kotlin-stdlib
Upgrading dagger uncovers an issue where java-only modules with
kotlin-containing dependencies may see org.jetbrains.annotations.NotNull
annotations.  Include the kotlin-annotations in the output jar the
same way kotlin-stdlib is included.

Bug: 227669740
Test: TestKotlin
Change-Id: Ifc33a32b121c1b9a9d1911bdec332264b78b571c
2022-05-04 19:07:32 +00:00
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