Commit Graph

84156 Commits

Author SHA1 Message Date
Treehugger Robot
fdc5ce9cd6 Merge "Remove hidden_api_packages as it is no longer needed" into main am: 2f867fd9ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165142

Change-Id: Id0fa3c9b9b06bf4e766c63fec8321f2a6fb46151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:12:47 +00:00
Treehugger Robot
2f867fd9ac Merge "Remove hidden_api_packages as it is no longer needed" into main 2024-07-11 20:59:19 +00:00
Colin Cross
d66ec63bde Merge "Remove test_per_src" into main am: 088123934b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142038

Change-Id: I9e0f306875ce0ad5c9767948a0d5d005b0751766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:49:26 +00:00
Colin Cross
088123934b Merge "Remove test_per_src" into main 2024-07-11 20:32:23 +00:00
Zi Wang
0bf506139e Merge "Update the way to get output files in license_metadata" into main am: 5ab1eb8822
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3167457

Change-Id: I9bba7c2d8d0115ad3ea869dd0fb9187368753171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:17:17 +00:00
mrziwang
0284657412 Fix typo in outputFilesForModule error message am: 68b2594524
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3167456

Change-Id: Iac1ee7ca6f85dbbbb4df7fafd71060ddeda1f589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:14:26 +00:00
Zi Wang
5ab1eb8822 Merge "Update the way to get output files in license_metadata" into main 2024-07-11 18:50:22 +00:00
mrziwang
01201ed2ed Update the way to get output files in license_metadata
The output files from a module is obtained from OutputFilesProvider
instead of from OutputFileProducer, which is going to be
deprecated.

Test: CI
Bug: 339477385
Change-Id: I2a5488653d9ba05c7ebd5a0b452e75fcc676c893
2024-07-11 10:21:57 -07:00
mrziwang
68b2594524 Fix typo in outputFilesForModule error message
Test: CI
Change-Id: I41f28a0412613458a0dad132006adfbc9fbbce2c
2024-07-11 09:58:30 -07:00
Chaitanya Cheemala
11fb0a2a3a Merge "Revert "Upgrade to clang-r530567"" into main am: 50fe598e79
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3166856

Change-Id: I47a9d498b651d54a4a6b33ab7f57dd67323d1e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 15:18:07 +00:00
Chaitanya Cheemala
50fe598e79 Merge "Revert "Upgrade to clang-r530567"" into main 2024-07-11 14:56:41 +00:00
ELIYAZ MOMIN
7b06cc9142 Merge "Revert "Upgrade to clang-r530567"" into main am: 52a4ae5744
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3166522

Change-Id: I05a80d62134ac71ee990196f1cb81e0d4596e1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 13:11:05 +00:00
Paul Duffin
d2adde79aa Remove hidden_api_packages as it is no longer needed
The `--hide-package` option that this uses is being removed from
Metalava. The same functionality can more easily be achieved by simply
creating a `package.html` or preferably `package-info.java` that
contains `@hide` in their `<body>` tag or Javadoc respectively.

Bug: 351991463
Test: m checkapi
Change-Id: If7ea2449d1bddc0df460c285bf7959dbf9409b04
2024-07-11 14:08:19 +01:00
Chaitanya Cheemala
8e2c5c22be Revert "Upgrade to clang-r530567"
This reverts commit b4f05f1a05.

Reason for revert: Likely culprit for b/352459464  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Iaea4511402b2818904f84e512f4f77487d0efafc
2024-07-11 12:48:56 +00:00
ELIYAZ MOMIN
52a4ae5744 Merge "Revert "Upgrade to clang-r530567"" into main 2024-07-11 12:38:30 +00:00
ELIYAZ MOMIN
9d00ea3e95 Revert "Upgrade to clang-r530567"
This reverts commit b4f05f1a05.

Reason for revert: <Potential culprit for b/352458178  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: Idf6c69296c6537e8011c2ce5fcbdf45a29154acf
2024-07-11 12:35:41 +00:00
Pechetty Sravani
ee70028051 Merge "Revert "Enable -Wfortify-source"" into main am: 45ca89a4a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165958

Change-Id: I024e002405673744c54320226d564b880fd3fa5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 10:22:55 +00:00
Pechetty Sravani
45ca89a4a2 Merge "Revert "Enable -Wfortify-source"" into main 2024-07-11 09:55:12 +00:00
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
Liana Kazanova
852a98fd8c Revert "Enable -Wfortify-source"
This reverts commit cbf426fa50.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/352395522. Will be verifying through ABTD before submission.

Change-Id: I214aa6e2a707ed22aac901db988a33affc37e269
2024-07-10 22:10:08 +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