Commit Graph

83951 Commits

Author SHA1 Message Date
Cole Faust
47bb8d83d0 Update selects_test for selects with deferred expressions
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I18257ff586fb31d4e0b012a249726a925832cdac
2024-06-26 15:51:26 -07:00
Colin Cross
7e800e7382 Merge "Make cmake_snapshot output reproducible" into main am: e5ef3e0ba0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3147436

Change-Id: I8945cbb534edd6e7e81b16430e80081871fc1bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 18:29:40 +00:00
Colin Cross
e5ef3e0ba0 Merge "Make cmake_snapshot output reproducible" into main 2024-06-26 18:09:04 +00:00
Zi Wang
dabcb68a7a Merge "Update outputFilesForModuleFromProvider" into main am: bf0d9120db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137574

Change-Id: I95ea078a112c125f888293c1bba9ba1cfa8663fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 17:37:25 +00:00
Dmitrii Ishcheikin
3e98920ad9 Merge "Add imgdiag ART APEX" into main am: aaec2d5e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3116226

Change-Id: I747ad867c471678a8641aeaa2b58718d08188925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 17:33:48 +00:00
Zi Wang
bf0d9120db Merge "Update outputFilesForModuleFromProvider" into main 2024-06-26 17:28:11 +00:00
Dmitrii Ishcheikin
aaec2d5e93 Merge "Add imgdiag ART APEX" into main 2024-06-26 16:54:13 +00:00
Treehugger Robot
21c898d598 Merge "Fix a bug that BUILD_VERSION_TAGS is ignored" into main am: 8884854267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3144738

Change-Id: Ie7589807ed9632fa961aa2f10ee68a724be0d47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 02:50:40 +00:00
Treehugger Robot
f43774ce84 Merge "Enforce that output files are created in primary ninja execution" into main am: e8d5c8a5b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141624

Change-Id: Id30a395be80c43f3ea7c74c4a4164ece261a939f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 02:49:46 +00:00
Spandan Das
5cd3894d96 Merge "Enforce that tests in MTS specify a min_sdk_version" into main am: 94df13d902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3144756

Change-Id: I0d0954b4ea2cbc72881d524ee47c7eac955d3f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 02:49:33 +00:00
Treehugger Robot
8884854267 Merge "Fix a bug that BUILD_VERSION_TAGS is ignored" into main 2024-06-26 02:47:00 +00:00
Treehugger Robot
e8d5c8a5b2 Merge "Enforce that output files are created in primary ninja execution" into main 2024-06-26 02:18:55 +00:00
Spandan Das
94df13d902 Merge "Enforce that tests in MTS specify a min_sdk_version" into main 2024-06-26 02:16:05 +00:00
Inseob Kim
5a994c7e9c Fix a bug that BUILD_VERSION_TAGS is ignored
Bug: 349046347
Test: set BUILD_VERSION_TAGS and build
Change-Id: Ib981d917435d23139ac0c5b0aba5b6893539d200
2024-06-26 10:30:21 +09:00
Treehugger Robot
d0f1492cc9 Merge "Remove the unused apiFileTag" into main am: 9c067f62d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3147357

Change-Id: Id1272b6d7f8741d6970bc9134ca4551aeb88f895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 00:29:42 +00:00
Treehugger Robot
9c067f62d0 Merge "Remove the unused apiFileTag" into main 2024-06-26 00:10:52 +00:00
Treehugger Robot
7735be9c9b Merge "Add unit test for sdk impl lib's lint report propagation to the apex" into main am: c33984d476
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3147356

Change-Id: I8ef599949173944b1d1d336019b5f318b9e8f51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 23:48:16 +00:00
Treehugger Robot
c33984d476 Merge "Add unit test for sdk impl lib's lint report propagation to the apex" into main 2024-06-25 23:34:11 +00:00
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
Colin Cross
7de1db7f2c Make cmake_snapshot output reproducible
Sort the outputs from cmake_snapshot to make the build.ninja file
reproducible.

Test: cmake_snapshot_test.go
Flag: EXEMPT refactor
Change-Id: I621e0dc9da7ad4c94234e0811f64d347024e3295
2024-06-25 22:55:59 +00:00
Spandan Das
b041087f58 Enforce that tests in MTS specify a min_sdk_version
Specifying min_sdk_version ensures backwards compatibility. There are
some existing violations, and those have been baseline'd using an
allowlist.

Bug: 156476221
Test: m nothing
Change-Id: I55098206da8ec5cfa0a9f5e7b41c9b8dedbdcbd2
2024-06-25 22:47:49 +00:00
Jihoon Kang
0ef9f7740a Remove the unused apiFileTag
This change removes the unused `apiScope.apiFileTag` and its
`depInfoExtractor` function.

Test: m nothing --no-skip-soong-tests
Change-Id: I640bee3a188be03742559e31ce4fbc4475dbd3ba
2024-06-25 22:47:35 +00:00
mrziwang
abdb293492 Update outputFilesForModuleFromProvider
This CL includes following changes:
1. Added the ability to differentiate the cases that module never
   sets OutputFilesProvider and that module sets the provider with
   a nil value.
2. Updated GenerateTaggedDistFiles to use outputFilesForModuleFromProvider.
3. Updated on cc module to use OutputFilesProvider.

Test: CI
Bug: 339477385
Change-Id: Ib5663a947315f6a90a81b7f073cf8dd22fbb1e05
2024-06-25 15:37:09 -07: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
784c005241 Add unit test for sdk impl lib's lint report propagation to the apex
This change adds a unit test for https://r.android.com/3146677

Test: m nothing --no-skip-soong-tests
Bug: 339267677
Change-Id: I48e1c2681aaa153b32b209f05a93c501af5d1bac
2024-06-25 22:15:39 +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
Spandan Das
8d8253f525 Enforce that output files are created in primary ninja execution
Missing output files in ninja execution will be treated as errors.
Products can bypass this using the newly introduced
BUILD_BROKEN_MISSING_OUTPUTS flag.

Test: m nothing # verified missingoutfile appears in out/soong.log
Test: checkbuild passes on presubmits

Change-Id: I4eebcd08aa57fc6ccf1688c32e0d1fe06d66ab9a
2024-06-24 19:26:45 +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