Commit graph

56865 commits

Author SHA1 Message Date
Jooyung Han
3f62092bd2 Merge "Clean up minSdkVersionAllowlist" am: 8ee3fb12d1 am: 64026a824f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080103

Change-Id: I9a53575222e59339f06d31ce37b5e8663b0e7ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:18:00 +00:00
Jooyung Han
64026a824f Merge "Clean up minSdkVersionAllowlist" am: 8ee3fb12d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080103

Change-Id: I685d537b8c2a824657418d9b67d5366c729cbb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:00:06 +00:00
Jooyung Han
8ee3fb12d1 Merge "Clean up minSdkVersionAllowlist" 2022-05-09 03:33:15 +00:00
Yurii Zubrytskyi
932a5faa66 Merge "build/soong - support the REL platform version in classpath" into tm-dev am: 2c268407dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18138216

Change-Id: Ia4f13f6b834634a358383cc529507638268dd964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:39:08 +00:00
Yurii Zubrytskyi
a14c447bcb Revert "Hacky workaround for half-finalized builds." am: 3cdd35199d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18135676

Change-Id: I9ad0bf5b1126ffef4472ebfb2d064bae0cde834a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:38:55 +00:00
Yurii Zubrytskyi
2c268407dc Merge "build/soong - support the REL platform version in classpath" into tm-dev 2022-05-07 15:11:19 +00:00
Chih-hung Hsieh
95859ee707 Merge "Reduce tidy checks in org.chromium.arc.mojom" am: 5181502756 am: 7196ec8e1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2088473

Change-Id: I447189a16ba3639641faed37918adf8ef076533d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:36:25 +00:00
Chih-hung Hsieh
a59acfc44b Merge "Add ALLOW_LOCAL_TIDY_TRUE" am: e7410d933a am: 44be23964a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089043

Change-Id: I26797e8952bab8e0d6a2c1abe4b5eac208f41548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:35:44 +00:00
Chih-hung Hsieh
7196ec8e1b Merge "Reduce tidy checks in org.chromium.arc.mojom" am: 5181502756
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2088473

Change-Id: If73407d46f36abc547dad43832cfd42e4deb9d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:11:29 +00:00
Chih-hung Hsieh
44be23964a Merge "Add ALLOW_LOCAL_TIDY_TRUE" am: e7410d933a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089043

Change-Id: Ie449de57e691229ff97e8e5f540045a2f21c6dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:10:36 +00:00
Chih-hung Hsieh
5181502756 Merge "Reduce tidy checks in org.chromium.arc.mojom" 2022-05-06 23:31:32 +00:00
Chih-hung Hsieh
e7410d933a Merge "Add ALLOW_LOCAL_TIDY_TRUE" 2022-05-06 23:31:26 +00:00
Trevor Radcliffe
d13a0636fe Merge "Make isolated true by default for gtest" am: 2845464d2d am: d2878482eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068108

Change-Id: I29c67ef4a2b72ec06fb0dea3fcee8232fc6ba5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 17:55:46 +00:00
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
Trevor Radcliffe
d2878482eb Merge "Make isolated true by default for gtest" am: 2845464d2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068108

Change-Id: Id6c0d9a99e62dc704d244f7d079323fd310caab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 17:29:58 +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
Trevor Radcliffe
2845464d2d Merge "Make isolated true by default for gtest" 2022-05-06 17:11:17 +00:00
Treehugger Robot
a11603a538 Merge "Treat kotlin-annotations the same as kotlin-stdlib" 2022-05-06 17:00:08 +00:00
Yurii Zubrytskyi
3cdd35199d Revert "Hacky workaround for half-finalized builds."
This reverts commit 50493f0797.

Reason for revert: build is now fully finalized

Change-Id: Iaa5b9d84b84303a8b8baf30641d861a035169f48
2022-05-06 16:10:04 +00:00
Yurii Zubrytskyi
1611334fa2 build/soong - support the REL platform version in classpath
Make sure we select the proper API level number for the REL
platform version when generating the classpath protos

Bug: 231272086
Test: build + boot emulator
Change-Id: Ib3b711dc05dd6136a68e6de414d806687a849bc9
2022-05-06 16:09:52 +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
Jooyung Han
0ea5277adf Clean up minSdkVersionAllowlist
remove NN modules from the list.

Bug: 158059172
Test: m com.android.neuralnetworks
Change-Id: I40b25a06afd81a8fad44c853cf4ccff41300f87a
2022-05-06 11:06:45 +09: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
Chih-Hung Hsieh
f3efde5e72 Add ALLOW_LOCAL_TIDY_TRUE
Bug: 229779921
Test: presubmit
Change-Id: I9ee65fbb96fc68a949e33b63b83d0609696d76a1
2022-05-05 14:46:34 -07:00
Chih-Hung Hsieh
47e35bbd25 Reduce tidy checks in org.chromium.arc.mojom
Too many warnings from this library.
Treat it the same as tidyExternalVendor projects.

Bug: 231626164
Test: make tidy-vendor-google_arc_subset
Change-Id: Ieaf748517390cb6dfac7e85500666dc9f49ffd52
2022-05-05 14:09:12 -07: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