Commit Graph

84136 Commits

Author SHA1 Message Date
Ulya Trofimovich
df24b94ca9 Merge "Add property No_dex_container to dexProperies." into main am: 59514dc77c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3164217

Change-Id: Icc5c341e1d1e13e47284e1271f1aef83dbe1dac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 09:22:10 +00:00
Ulya Trofimovich
59514dc77c Merge "Add property No_dex_container to dexProperies." into main 2024-07-11 08:48:54 +00:00
Ulya Trafimovich
c8160584f3 Add property No_dex_container to dexProperies.
This is needed to allow individual apps disable dex container (also
known as "multi-dex") once it has been enabled globally. This property
does not translate to D8 options, it is used only in the build system.

Bug: 341652226
Bug: 329907267
Test: atest CarLauncherTests -- --abi x86_64
Change-Id: I3afda554af93dbb35bb2f4a8032ac0f5ed1df40d
2024-07-11 08:47:54 +01:00
Yabin Cui
a5fa71ca74 Merge "Upgrade to clang-r530567" into main am: 295306f5f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118932

Change-Id: Ib8d30ce952ac87c1a57cd46654ff57db3afa243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 04:18:01 +00:00
Yabin Cui
295306f5f2 Merge "Upgrade to clang-r530567" into main 2024-07-11 04:01:25 +00:00
Zi Wang
c86a0975fe Merge "Use OutputFilesProvider on java modules" into main am: 256772f02c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165563

Change-Id: Iad4f22396b46ac797fbfab031764166c269742f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 01:52:40 +00:00
Zi Wang
256772f02c Merge "Use OutputFilesProvider on java modules" into main 2024-07-11 01:24:10 +00:00
Aditya Kumar
7641f7073b Merge "Enable -Wfortify-source" into main am: 05f3927c09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157441

Change-Id: I7c846c60c43bb971c3df1b05d36462332bb10f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 21:33:03 +00:00
Aditya Kumar
05f3927c09 Merge "Enable -Wfortify-source" into main 2024-07-10 21:07:26 +00:00
Colin Cross
6d99f78bf2 Merge "Support defaults for gensrcs modules" into main am: 06c0a03bbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081784

Change-Id: I118549fff1e9c010327fb3daf87a068bf2ce01d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 21:01:15 +00:00
Colin Cross
06c0a03bbe Merge "Support defaults for gensrcs modules" into main 2024-07-10 20:42:54 +00:00
LaMont Jones
8954da351c Merge "Allow n2 as a replacement for ninja in builds" into main am: 1ff11b5159
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3087205

Change-Id: I1f09b1249b1c3ab8fd86f9b10a71f763b1e2abec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 19:40:13 +00:00
Colin Cross
e91c19be49 Merge "Add oryon to arm64 cpu variants" into main am: 9e47dcc597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163726

Change-Id: I7f008226026c4486055e056aad0e53e08919dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 19:39:48 +00:00
LaMont Jones
1ff11b5159 Merge "Allow n2 as a replacement for ninja in builds" into main 2024-07-10 19:39:23 +00:00
Cole Faust
bee030d36b Allow n2 as a replacement for ninja in builds
If `SOONG_USE_N2=true` is set in the environment, then n2 is used in
place of ninja.  Some ninja features are not available in n2 at this
time, but this enables bringup efforts to happen in parallel.

Bug: 352368206
Test: manual
Change-Id: I8455cb24eb640a4651782ee76e48a7d3a9932b93
2024-07-10 12:35:32 -07:00
Colin Cross
9e47dcc597 Merge "Add oryon to arm64 cpu variants" into main 2024-07-10 19:26:24 +00:00
mrziwang
9f7b9f4a9a Use OutputFilesProvider on java modules
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I3c9f0b766325dd490bc903dc65259c3953d34606
2024-07-10 12:18:06 -07:00
Roopesh Nataraja
826912e7d4 Add oryon to arm64 cpu variants
Bug: 350058746
Test: builds
Change-Id: I717e035165a7529629061cbfcb076b168dc031d6
2024-07-10 10:24:04 -07:00
Treehugger Robot
8220b33842 Merge "Support for prebuilt_avb in Soong" into main am: 9ed8aff5e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163777

Change-Id: I95e26f7dbdabacdc87758e276bf27fe75227ef7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 02:11:59 +00:00
Treehugger Robot
9ed8aff5e3 Merge "Support for prebuilt_avb in Soong" into main 2024-07-10 01:54:31 +00:00
Nelson Li
1fb94b2245 Support for prebuilt_avb in Soong
Generally, the `root` directories for `prebuilt_etc` and
`prebuilt_root` are <partitions>. And <partitions> default to false
for InstallInRoot(), they always create a "system" subdirectory.
(See android/paths.go:modulePartition())

However, avb keys like `q-developer-gsi.avbpubkey` are installed by
default in the `avb` subdirectory under the `root directory` of the
<partition>. Therefore, it is necessary to create `prebuilt_avb` in
Soong and force the installation directory to be the `avb` subdirectory
under the `root directory` of the <partition> to meet the requirements.

Bug: 347636127
Test: go test -run TestPrebuiltAvbInstallDirPath
Change-Id: I0ee08492da9a96a567700a7285c527b280dcd5db
2024-07-10 08:43:53 +08:00
Treehugger Robot
dfe63386f4 Merge "Properly package JNI libs in Robo tests" into main am: 60cb3a6dce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3164496

Change-Id: Ib668df077779ac60d86ea73c8f065d65de721aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 23:31:28 +00:00
Treehugger Robot
60cb3a6dce Merge "Properly package JNI libs in Robo tests" into main 2024-07-09 23:10:30 +00:00
Zi Wang
ba049bf44e Merge "Use OutputFilesProvider on Import, AARImport and AndroidAppImport" into main am: 8dfc2bf163
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165036

Change-Id: Iec3854ddb3f61a502d5afaa605d667a9929beb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 21:48:09 +00:00
Zi Wang
8dfc2bf163 Merge "Use OutputFilesProvider on Import, AARImport and AndroidAppImport" into main 2024-07-09 21:28:55 +00:00
Zi Wang
f43b82849d Merge "Use OutputFilesProvider on droidstubs" into main am: e020ba9ce0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155559

Change-Id: I2003e1dcf3a57268956216d581b06ca4bf4cc454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 20:54:26 +00:00
Zi Wang
e020ba9ce0 Merge "Use OutputFilesProvider on droidstubs" into main 2024-07-09 20:38:54 +00:00
Zi Wang
0a11f4f4f6 Merge "Remove OutputFiles method from llndk_libraries_txt and sanitizer_libraries_txt" into main am: aee299e9f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3156879

Change-Id: I6d7e6264b0c00e9020ab323e48781ab7cd667c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 20:01:11 +00:00
Zi Wang
aee299e9f3 Merge "Remove OutputFiles method from llndk_libraries_txt and sanitizer_libraries_txt" into main 2024-07-09 19:30:39 +00:00
mrziwang
39e68fff47 Use OutputFilesProvider on droidstubs
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I8ea7463cfc3881d800255aa99147897eeba85b04
2024-07-09 10:57:54 -07:00
Ivan Lozano
aba0e13e50 Merge "Disable dsymutil usage on Darwin host" into main am: dc554b218d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3162321

Change-Id: Id67d3f83197935b1a2083da18eddb8d3d23cfff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 17:50:03 +00:00
mrziwang
68786d81de Use OutputFilesProvider on Import, AARImport and AndroidAppImport
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I51ccf59f97cb8a790642cb4463c479feaf18058a
2024-07-09 10:41:55 -07:00
Ivan Lozano
dc554b218d Merge "Disable dsymutil usage on Darwin host" into main 2024-07-09 17:35:14 +00:00
LaMont Jones
8ca591acbf Merge "Avoid C++ naming error" into main am: ad111586a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3162998

Change-Id: Ic5fc3b57c3916e8770c214b2b3e0b817ac0570c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 13:05:53 +00:00
LaMont Jones
ad111586a7 Merge "Avoid C++ naming error" into main 2024-07-09 12:49:29 +00:00
Jamie Garside
56f2b7000c Properly package JNI libs in Robo tests
Previously, the jni_libs property was ignored when packaging
robolectric-tests.zip, meaning that tests sometimes couldn't find native
libraries. This change causes any native libs that tests use to be
written alongside the .jar/.apk for Robolectric tests.

99% of this code is just stolen from the Ravenwood tests, as they work
in this area. In short though, any native libs will be built for the
host arch and put in the correct place.

Tests are a little lacking (just testing the new functionality), but I'm
not 100% sure how to test the rest of the Robolectric file.

Bug: 340801983
Test: Manually verified, `go test` in java/
Change-Id: I4ef28b1cbc4675fc329dc8fcab06d055d6538e60
2024-07-09 11:04:29 +00:00
Alyssa Ketpreechasawat
0666f97444 Merge "Add option to override defaultManifestVersion for app." into main am: 40ca9c933b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160716

Change-Id: I0923287f9471e7291323daa0a9337ecd0dae7792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 10:09:35 +00:00
Alyssa Ketpreechasawat
40ca9c933b Merge "Add option to override defaultManifestVersion for app." into main 2024-07-09 09:33:48 +00:00
Alyssa Ketpreechasawat
ee8b44e72a Add option to override defaultManifestVersion for app.
Add an option to override defaultManifestVersion using environment
variable. With this environment variable, the mainline developer will be able to locally customize the app version to higher version and install it to target devices. This is also helpful as a workaround to adjust app/apex version for coverage build (e.g. 3520 to 3500) and allow the installation of app/apex from mainline release branch (e.g. 3508) onto it. This functionality already existed for apex, so we are extending to the app.

Test: 347735412
Bug: 350986287
Bug: 347735412
Test: OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION=990090000 m
Test: adb shell pm list packages --show-versioncode
Change-Id: I58259fe781ca121ba4067f308f1744d80c1c2d48
2024-07-09 09:32:48 +00:00
Treehugger Robot
ef1a328bbe Merge "cc_cmake_snapshot: drop Modules field" into main am: 72be248e10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150826

Change-Id: I3fa6f15575e86c44b94c12751e38d93511ff55ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 01:59:59 +00:00
Treehugger Robot
16a6969bd3 Merge "LLNDK libraries can also provide libraries" into main am: 88af056544
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160968

Change-Id: I888946023ef4879569409b589a6e592a3740f97f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 01:59:27 +00:00
Treehugger Robot
72be248e10 Merge "cc_cmake_snapshot: drop Modules field" into main 2024-07-09 01:01:44 +00:00
Treehugger Robot
88af056544 Merge "LLNDK libraries can also provide libraries" into main 2024-07-09 00:51:45 +00:00
Nathan Egge
ecc6a2aa91 Merge "Add LEX to the list of env variables to unset." into main am: c41630c249
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160237

Change-Id: I98571010c6230227b51eb2ed8054457f1ecb9805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 00:29:02 +00:00
Treehugger Robot
2567bfda58 Merge "Relax cflag checks for -Xclang and -target*" into main am: 8359e6e0c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3162997

Change-Id: I1e109480298dbf1c29955a1683fae4c4feccc69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 00:24:49 +00:00
Nathan Egge
c41630c249 Merge "Add LEX to the list of env variables to unset." into main 2024-07-09 00:15:53 +00:00
Treehugger Robot
8359e6e0c3 Merge "Relax cflag checks for -Xclang and -target*" into main 2024-07-09 00:05:44 +00:00
Alyssa Ketpreechasawat
c8bbce485f Merge "Add "strip: {none: true}" for cc_prebuilt_library_shared in sdk snapshot." into main am: 07bceec1fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159527

Change-Id: I38ce33d6504cfe09fc0588315a74859e07525141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-08 20:55:42 +00:00
Nathan Egge
978c934dd9 Add LEX to the list of env variables to unset.
Some linux environments export LEX and this variable must be unset to
 ensure Soong and Make LEX values match.

Change-Id: I8ff2b62a49e0108575ff88b1a88a83d650fc3768
2024-07-08 20:53:46 +00:00
Alyssa Ketpreechasawat
07bceec1fd Merge "Add "strip: {none: true}" for cc_prebuilt_library_shared in sdk snapshot." into main 2024-07-08 20:39:59 +00:00