Commit Graph

83926 Commits

Author SHA1 Message Date
Jihoon Kang
e19a7ae1d1 Merge "Modify extractStubsSourceInfoFromDep to respect RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag" into main am: 00d405099c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141091

Change-Id: I9da1bb19bd4735d5542f90257ab4b6070431b226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 23:20:29 +00:00
Jihoon Kang
00d405099c Merge "Modify extractStubsSourceInfoFromDep to respect RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag" into main 2024-06-25 23:00:00 +00:00
Treehugger Robot
7c90072c34 Merge "Utilize linter artifacts of the impl library in the top level sdk library" into main am: 94a6824c99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3146677

Change-Id: If7570dbb7da214c7ad75b20161356a83ca4c4e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 22:35:31 +00:00
Jihoon Kang
2a26b1326b Modify extractStubsSourceInfoFromDep to respect RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag
Currently, extractStubsSourceInfoFromDep always return the "everything"
stub artifacts. This change modifies such behavior so that the
"exportable" artifacts are set when
`RELEASE_HIDDEN_API_EXPORTABLE_STUBS` build flag is set to true.

Test: m nothing --no-skip-soong-tests
Bug: 348370901

Change-Id: I1cf0ff7a63c8a580c3553a817ca303d6e8734a2a
2024-06-25 22:24:42 +00:00
Treehugger Robot
94a6824c99 Merge "Utilize linter artifacts of the impl library in the top level sdk library" into main 2024-06-25 22:18:51 +00:00
Jihoon Kang
629e2a3e9a Utilize linter artifacts of the impl library in the top level sdk library
When creating the lint reports for the mainline modules, the apex
build rule collects the lint artifacts from its dependencies. The
artifacts for Java modules are collected using the two methods:
- `JacocoReportClassesFile()`
- `LintDepSets()`

https://r.android.com/3079425 has removed the compilation actions from
the top level sdk library, but given that BCPF and SSCPF still list the
top level sdk library as the dependency, the lint artifacts are
collected from the top level sdk library. The aforementioned change
resolved this discrepancy by the top level sdk library referencing the
build artifacts of the implementation library.

However, `LintDepSet()` was mistakenly left out, leading to the lint
xml file of the sdk library not being correctly included in the apex
lint artifacts. This change fixes such discrepancy by the top level sdk
library correctly referencing the lint dep set output of the
implementation library.

Bug: 339267677
Test: TARGET_RELEASE=ap3a TARGET_BUILD_VARIANT=userdebug
PRODUCT=mainline_modules_x86_64 MODULE_RELEASED_PLATFORM=U
COVERAGE_MODULES="configinfrastructure"
./vendor/google/build/build_unbundled_coverage_mainline_module.sh \
inspect ninja command and verify that the lint xml files of the impl lib
is included in com.android.configinfrastructure module lint-report-xml.zip

Change-Id: I5c397c8782bad3bc21524f9ef7991cfdda4cdda1
2024-06-25 20:47:49 +00:00
Treehugger Robot
05145c8a17 Merge "Cleanup more bazel code" into main am: 51fc67bd20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3146657

Change-Id: I4c7c226a331b50c9ac38ecba6146dab4fb2d45c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 19:40:38 +00:00
Treehugger Robot
51fc67bd20 Merge "Cleanup more bazel code" into main 2024-06-25 19:24:12 +00:00
Joe Onorato
883ae14e55 Merge "RBE is only supported when the host is linux, so don't try on others." into main am: c870a75fe1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3143223

Change-Id: Ie6441d8d460c10fd1580e5ae523bb792af9ddcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 18:19:36 +00:00
Cole Faust
487b144fe0 Cleanup more bazel code
Bug: 315353489
Test: m nothing --no-skip-soong-tests
Change-Id: I6c6b4fcd559f4a45b1a96c70cbb5d6d1a615ccff
2024-06-25 11:02:38 -07:00
Joe Onorato
c870a75fe1 Merge "RBE is only supported when the host is linux, so don't try on others." into main 2024-06-25 17:58:35 +00:00
Wei Li
38e35b990f Merge "Export Soong modules and build a database from metadata from Make and Soong." into main am: af64ca9322
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141985

Change-Id: I591e168872711004ecf5ac9305949e00f4bc4045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 04:45:34 +00:00
Wei Li
af64ca9322 Merge "Export Soong modules and build a database from metadata from Make and Soong." into main 2024-06-25 04:19:46 +00:00
Justin Yun
371d5daac8 Call InstallFile to install files in soong built filesystem am: 8a7978cb16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142445

Change-Id: I9b2ce197668b4de10cbad5d773f51bb4c8a58ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 02:15:37 +00:00
Justin Yun
8a7978cb16 Call InstallFile to install files in soong built filesystem
platform_compat_config modules install files in `system/etc`, but the
files are missing from the soong-defined system image.
Calling InstallFile solves the problem.

Bug: 339133685
Test: m aosp_cf_system_x86_64
Change-Id: I46d5e75424a85108d0b478e4f0143f16ee26b53e
2024-06-25 09:40:30 +09:00
Wei Li
a1aa297518 Export Soong modules and build a database from metadata from Make and Soong.
Bug: 324465531
Test: CIs
Test: m compliance-metadata.db
Change-Id: Ia1c9ab0ae874dd47969555ddbfb93405b57a651f
2024-06-24 17:20:59 -07:00
Zi Wang
9c90a531ae Merge "Add OutputFilesProvider support for singleton" into main am: b651aaaf9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141542

Change-Id: I4ab9a26cf288eb66b9ef04bc86281375c06e34ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 22:30:28 +00:00
Zi Wang
b651aaaf9e Merge "Add OutputFilesProvider support for singleton" into main 2024-06-24 22:13:42 +00:00
Joe Onorato
86f50e752e RBE is only supported when the host is linux, so don't try on others.
Bug: 343589123
Test: m and verify
Change-Id: I872d36a40c980f58c5de2598c3fb5dcfcadabf4f
2024-06-24 14:28:25 -07:00
Spandan Das
a826230410 Merge "Declare the implicit outputs for r8RE" into main am: 79035fa842
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3140911

Change-Id: Ibb5902170dc3a216356255f57020b5f529e0c403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:38:54 +00:00
Spandan Das
79035fa842 Merge "Declare the implicit outputs for r8RE" into main 2024-06-24 20:18:16 +00:00
mrziwang
0cbd3b0e79 Add OutputFilesProvider support for singleton
This CL also changes to use OutputFilesProvider on rust module, which
has singleton involved.

Test: CI
Bug: 339477385
Bug: 348494466
Change-Id: Idc5c0fb9f8425f09184d5b73531ee3052e5a076c
2024-06-24 11:55:47 -07:00
Spandan Das
d447bbbae5 Declare the implicit outputs for r8RE
The implicit outputs created by r8 (e.g. art profile) was added to the
non RE rule, but not to the RE one.

Test: Created a go/abtd run with SystemUI profile guided dexpreopt
https://android-build.corp.google.com/builds/abtd/run/L92900030004716290
Test: Verified that the .odex size of SystemUI on RE builds matches non
RE builds
https://screenshot.googleplex.com/6kLCXdBzzVWW3s8

Change-Id: Ie03a7f7896170b36ce83360eaf260cd3765a3fd7
2024-06-24 18:43:27 +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
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
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
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
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
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
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
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