Commit Graph

83943 Commits

Author SHA1 Message Date
Cole Faust
87d398a4d6 Update selects_test for selects with deferred expressions
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I18257ff586fb31d4e0b012a249726a925832cdac
2024-06-24 14:01:14 -07:00
Jihoon Kang
77946d1836 Merge "Move vendor and product variant generation logic from cc package to android package" into main am: 79b0eef5a1 am: 5b4ba0dc4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138913

Change-Id: I0041cf52894795adaa9e8b0c67595eb0b9047146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 19:05:38 +00:00
Jihoon Kang
5b4ba0dc4b Merge "Move vendor and product variant generation logic from cc package to android package" into main am: 79b0eef5a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138913

Change-Id: I6ff089c1dab3672b1c5aaabbe011b0b8de4be7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 18:46:22 +00:00
Jihoon Kang
79b0eef5a1 Merge "Move vendor and product variant generation logic from cc package to android package" into main 2024-06-21 18:16:31 +00:00
Roland Levillain
057acee58b Update Blueprint link in README.md to point to Android's version. am: cd2604b0eb am: 311cacd336
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142877

Change-Id: Id77a26ca2f2f3d00c9a078cd1fa61efea93aa069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 17:54:45 +00:00
Roland Levillain
311cacd336 Update Blueprint link in README.md to point to Android's version. am: cd2604b0eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142877

Change-Id: I59e63ca4ba4071f5e097305b3ac9d40d190124b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 17:35:59 +00:00
Roland Levillain
cd2604b0eb Update Blueprint link in README.md to point to Android's version.
Change-Id: If6226e74f2d53658fceb8e5a4083745d2ecea140
2024-06-21 16:24:01 +00:00
Jihoon Kang
47e918450f Move vendor and product variant generation logic from cc package to android package
Although image variation generation logic has moved out of cc package to
the android package, the vendor and product partition variants
generation logic is still specific to cc package. Therefore, in order to
create a product or vendor variant, they have to specified in
`ExtraImageVariants`. In order to avoid such confusing behaviors and
enforce modules to specify product and vendor installation rules, this
change moves the vendor and product variant generation logic to
android.ImageInterface.

Test: m nothing --no-skip-soong-tests && diff contents of out/soong/Android-{product}.mk
Change-Id: I9e14f3739d9dea94167ee6a91e92b2f942055aba
2024-06-21 07:45:09 +00:00
Cole Faust
6dcd424f90 Merge "Allow soong config variables to be boolean-typed" into main am: 1c74ac54a8 am: 3e64476edd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141002

Change-Id: I012dd89e71e370015682998b62447747403fbd1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:10:06 +00:00
Cole Faust
3e64476edd Merge "Allow soong config variables to be boolean-typed" into main am: 1c74ac54a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141002

Change-Id: I0473826c4a9c9f9c3b0cea8dbad8aa59f09f03d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:35 +00:00
Cole Faust
1c74ac54a8 Merge "Allow soong config variables to be boolean-typed" into main 2024-06-21 01:21:25 +00:00
Treehugger Robot
33ff29996a Merge "Minor cc_cmake_snapshot touch-ups" into main am: 14a77d3a7f am: 3a6ca3f1ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141005

Change-Id: I5ccb0b205bbd7ccfc3b30781b3db104b3b7bc08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:47:52 +00:00
Treehugger Robot
3a6ca3f1ec Merge "Minor cc_cmake_snapshot touch-ups" into main am: 14a77d3a7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141005

Change-Id: Id11522ccc29aefd3f97ea1e50fed9c153961e099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:29:58 +00:00
Treehugger Robot
14a77d3a7f Merge "Minor cc_cmake_snapshot touch-ups" into main 2024-06-20 23:58:00 +00:00
Zi Wang
c67c4fca4a Merge "Allow module gets its own output files using non-empty-string tag" into main am: fe658ac53a am: 0e4e48951f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141616

Change-Id: I624603d0f05831cf34a49f2c60117e08ab5ce5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 22:35:20 +00:00
Tomasz Wasilczyk
2493fcc7b5 Minor cc_cmake_snapshot touch-ups
- Partial support for arm64 hosts (no prebuilts yet)
- Replace incorrect template function use MATCHES with STREQUAL
- Add more ignored system libs
- No need to explicitly add libc++ prebuilt

Bug: 285204695
Test: m binder_sdk
Change-Id: Id6508cc9f9ee6328c95c2821c325629f84eda138
2024-06-20 15:30:09 -07:00
Cole Faust
46f6e2f1aa Allow soong config variables to be boolean-typed
So that you can use `true` instead of `"true"` in select expressions.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I950bd8e04f8fab5187ea5075514d476227943f33
2024-06-20 14:59:10 -07:00
Zi Wang
0e4e48951f Merge "Allow module gets its own output files using non-empty-string tag" into main am: fe658ac53a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141616

Change-Id: I8b6ab95d2aefc2d7bd840c75bdf4dc399d84d485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 21:40:56 +00:00
Zi Wang
fe658ac53a Merge "Allow module gets its own output files using non-empty-string tag" into main 2024-06-20 21:07:52 +00:00
Xin Li
771bfaa8ec [automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 037736c1d0 -s ours
am skip reason: Merged-In I64ddf6215ddfe33e180a54bf8a98092da8286808 with SHA-1 3d530c24d7 is already in history

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

Change-Id: I888aa8b72eb3303024560d384f9ae25ee539641c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:57:33 +00:00
Xin Li
f314e3db46 [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 3956a39b9b -s ours
am skip reason: Merged-In I64ddf6215ddfe33e180a54bf8a98092da8286808 with SHA-1 3d530c24d7 is already in history

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

Change-Id: Id9fff1ec8412e9c6e205b1ca88dc0b46822667a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:56:56 +00:00
Treehugger Robot
fe6ccc2747 Merge "Add --tag argument to soongdbg" into main am: e28ee78351 am: 38445bf59f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141538

Change-Id: I73d0ef92acffb0efd9221db6f374d11b4fba7465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:46:19 +00:00
Xin Li
037736c1d0 Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future 2024-06-20 19:38:53 +00:00
Treehugger Robot
38445bf59f Merge "Add --tag argument to soongdbg" into main am: e28ee78351
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141538

Change-Id: I41490a2a89be09a69315df30711e367da55ddffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:25:07 +00:00
Treehugger Robot
e28ee78351 Merge "Add --tag argument to soongdbg" into main 2024-06-20 19:10:34 +00:00
Zi Wang
b7b83edec5 Merge "Use OutputFilesProvider on python_binary_host" into main am: 66c8090a3a am: c067119409
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137735

Change-Id: Ic6961cfcbf8c653077cbc49fffd182fa1f7360a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:55:36 +00:00
Zi Wang
a1fef530dc Merge "ExportableModule no longer implements OutputFileProducer" into main am: c48c1b5721 am: 8d0c115e35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131731

Change-Id: I3990a2152cf51dc7b50aec6b9190789f4d4fab32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:55:24 +00:00
Zi Wang
c067119409 Merge "Use OutputFilesProvider on python_binary_host" into main am: 66c8090a3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137735

Change-Id: I0b3fe4ce88de4a6c35259e85f1ff3b0ae2981ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:30:06 +00:00
Zi Wang
8d0c115e35 Merge "ExportableModule no longer implements OutputFileProducer" into main am: c48c1b5721
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131731

Change-Id: I7ba01f53d53b030db18f1608b30412df8ac874aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:29:52 +00:00
Zi Wang
66c8090a3a Merge "Use OutputFilesProvider on python_binary_host" into main 2024-06-20 18:20:17 +00:00
Treehugger Robot
cb9d63cb25 Merge "Remove an out of date comment." into main am: 50d40cbc8c am: 443a976a94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141137

Change-Id: I3ddee09ef76e2875b0d7c7ebfcda874e1cf667bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:17:25 +00:00
Spandan Das
6ab2cd1bd5 Add unit test for sdk library permission xml file am: 3ee19697d5 am: bb6c60e7c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137580

Change-Id: I97245143372185ed61c85aa60b93237d63f7636d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:17:11 +00:00
mrziwang
069da0c1e3 Use OutputFilesProvider on global_compat_config am: 9e7127ff3b am: bc6361607f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137576

Change-Id: Ie07160f7a260f66169bc25bc7f7cdeac2392a88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:16:43 +00:00
Zi Wang
c48c1b5721 Merge "ExportableModule no longer implements OutputFileProducer" into main 2024-06-20 18:09:24 +00:00
Joe Onorato
250c551a26 Add --tag argument to soongdbg
The --tag argument will filter the dependencies to just the given deptags
as it walks the graph.

Test: soongdbg deps --tag android/soong/android.defaultsDependencyTag framework-minus-apex
Test: soongdbg between --tag android/soong/android.defaultsDependencyTag framework-minus-apex framework-minus-apex-defaults
Change-Id: I566477ffcd9d5e4b3e57155f65e84999e4908c79
2024-06-20 11:05:17 -07:00
Treehugger Robot
443a976a94 Merge "Remove an out of date comment." into main am: 50d40cbc8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141137

Change-Id: Iec697d450e82ba17806a3ffd61344f2fdab504fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 17:56:35 +00:00
Spandan Das
bb6c60e7c4 Add unit test for sdk library permission xml file am: 3ee19697d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137580

Change-Id: I85a1a43b04360a9e170dabf64dccbb95a3562a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 17:56:22 +00:00
mrziwang
bc6361607f Use OutputFilesProvider on global_compat_config am: 9e7127ff3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137576

Change-Id: Icc49328fa96fbc0b5673bfa05d15ab20513804fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 17:56:15 +00:00
Treehugger Robot
50d40cbc8c Merge "Remove an out of date comment." into main 2024-06-20 17:47:15 +00:00
Spandan Das
3ee19697d5 Add unit test for sdk library permission xml file
Followup to the fix in https://r.android.com/3137737. This adds a unit
test to check the permission xml file contents of sdk library. This file
contains the on-device location of the sdk implementation library.
override/overridden apexes are installed in the same location, so the
on-device sdklibrary path should remain consistent in the xml files of
the override and overridden apexes.

Test: go test ./apex
Bug: 346486531
Change-Id: I61adbf94bdfce8aa89de89cc90b6f564f2f7417f
2024-06-20 17:36:54 +00:00
mrziwang
4295359c12 Allow module gets its own output files using non-empty-string tag
Test: CI
Bug: 339477385
Change-Id: I332c377ad59d9355cb44ee18b85a56e37580e7b6
2024-06-20 10:02:26 -07:00
Zi Wang
6fe215c87c Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main am: 26faf1b321 am: 674d1872e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133295

Change-Id: I9c7ea9774a8d0d0ed57acb74f513cb0b91214a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 16:46:54 +00:00
Zi Wang
4f9952bf5a Merge "Use OutputFilesProvider on sdk" into main am: 9b3fba9b0b am: 8ab5d0619a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138075

Change-Id: Iaca0ec42fef8bc334bae694351255182b8d84104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 16:46:12 +00:00
Elliott Hughes
b3b05ba84d Remove an out of date comment.
libandroid_support no longer exists.

Change-Id: I6e66f3e0fd5c58bff3c91563a33e0afc8614488c
2024-06-20 16:34:19 +00:00
Zi Wang
674d1872e4 Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main am: 26faf1b321
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133295

Change-Id: Ib129339698ecaa6d0c1c7b6013965e4c3bf42b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 16:31:34 +00:00
Zi Wang
8ab5d0619a Merge "Use OutputFilesProvider on sdk" into main am: 9b3fba9b0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138075

Change-Id: I25c34bdb7892195da012215489eea504a172febf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 16:30:37 +00:00
mrziwang
9e7127ff3b Use OutputFilesProvider on global_compat_config
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: I6deb4a005876848f28a5b823a712d9eea33a44e6
2024-06-20 16:20:06 +00:00
mrziwang
e7ec89e0a9 ExportableModule no longer implements OutputFileProducer
multitree.ExportableModule no longer implements
android.OutputFileProducer

In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

ApiSurface and apexBundle are included in this change.

Test: CI
Bug: 339477385
Change-Id: I9247bb2dfed270a879f8bc96c6aa06803fde0150
2024-06-20 16:19:48 +00:00
Zi Wang
26faf1b321 Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main 2024-06-20 16:18:16 +00:00
Zi Wang
9b3fba9b0b Merge "Use OutputFilesProvider on sdk" into main 2024-06-20 16:17:49 +00:00