Commit Graph

8799 Commits

Author SHA1 Message Date
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
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
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
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
Liana Kazanova
60bc75d464 Merge "Revert^3 "Make Lint FlaggedApi violations errors"" into main am: e680d1b381
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3162416

Change-Id: I4ebd1f8ed7c75f0fd399bfe88d109bc7a4ebb740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-08 18:20:22 +00:00
Liana Kazanova
e680d1b381 Merge "Revert^3 "Make Lint FlaggedApi violations errors"" into main 2024-07-08 17:56:06 +00:00
ELIYAZ MOMIN
8609726c15 Revert^3 "Make Lint FlaggedApi violations errors"
This reverts commit 373024d012.

Reason for revert: <Potential culprit for b/351156674 and b/351161963 - 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: I54b011d88b521a81918574d174c208fab0047adb
2024-07-08 13:32:42 +00:00
Mårten Kongstad
0cc7e0ccb5 Merge "Revert^2 "Make Lint FlaggedApi violations errors"" into main am: 95561d23b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159599

Change-Id: I6a1e26d7b93ccaef7d6cadd51c215c949b1ddc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 13:57:05 +00:00
Mårten Kongstad
95561d23b3 Merge "Revert^2 "Make Lint FlaggedApi violations errors"" into main 2024-07-04 13:02:19 +00:00
Mårten Kongstad
373024d012 Revert^2 "Make Lint FlaggedApi violations errors"
This reverts commit 38813efb53.

Reason for revert: all known Lint violations baselined.

Change-Id: Ic6bf778df563ef6a592427442a9cc6a3d9ef8b51
2024-07-04 11:39:55 +00:00
Priyanka Advani
ffafa96de0 Merge "Revert "Make Lint FlaggedApi violations errors"" into main am: 58d4898b12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159358

Change-Id: Ia55d130405eedf57e0ec62ad5733663098ad415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 00:32:49 +00:00
Priyanka Advani
58d4898b12 Merge "Revert "Make Lint FlaggedApi violations errors"" into main 2024-07-04 00:17:28 +00:00
Priyanka Advani
38813efb53 Revert "Make Lint FlaggedApi violations errors"
Revert submission 3156916-flagged-api-lint-baseline

Reason for revert: Droidmonitor created revert due to build breakages in b/350976857.

Reverted changes: /q/submissionid:3156916-flagged-api-lint-baseline

Change-Id: I625226c2d2a4b68094a6566d7a9459bd36d935c5
2024-07-03 19:53:55 +00:00
Treehugger Robot
b23109b27c Merge "Make Lint FlaggedApi violations errors" into main am: 013e72c8e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3140777

Change-Id: I0907e62f5f828ef19ad89451c8ceeeaf94004005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 15:53:23 +00:00
Treehugger Robot
013e72c8e5 Merge "Make Lint FlaggedApi violations errors" into main 2024-07-03 15:38:18 +00:00
Zi Wang
b1870a994e Merge "Use OutputFilesProvider on prebuilt_stubs_sources" into main am: 381ee0f77a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155797

Change-Id: I3e8a3ec2b13c2de57c921823addff00d80dd55e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-01 23:37:35 +00:00
mrziwang
aa2a2b6119 Use OutputFilesProvider on prebuilt_stubs_sources
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: I3468505c678f7af92d669d1a02d6f26b1c2e199d
2024-07-01 12:09:20 -07:00
Kevin Liu
8bf63af995 Merge "Revert^2 "Set strict_mode to true"" into main am: 00c2b86d62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3153076

Change-Id: I1d5a0489fda33eb01a4902f98eee85781b9a4841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 18:59:29 +00:00
Kevin Liu
00c2b86d62 Merge "Revert^2 "Set strict_mode to true"" into main 2024-06-28 18:33:35 +00:00
Zi Wang
9150100e9d Merge "Use OutputFilesProvider on platformBootclasspathModule" into main am: 6650b15953
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150824

Change-Id: Ib12c3bcd6563980e92f79eb746d46bf319f4d890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 16:56:38 +00:00
Zi Wang
6650b15953 Merge "Use OutputFilesProvider on platformBootclasspathModule" into main 2024-06-28 16:39:39 +00:00
Kevin Liu
51349b87e9 Revert^2 "Set strict_mode to true"
a475258298

Change-Id: I751aa55a873714a4344bf85a33ea26d30604bacb
2024-06-28 15:02:12 +00:00
Pechetty Sravani
dc89ded835 Merge "Revert "Set strict_mode to true"" into main am: 3dcfc11ad9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3152316

Change-Id: Iee69f9f2e612f4dfc21e8545859a3486dbdb4d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 09:26:40 +00:00
Pechetty Sravani
3dcfc11ad9 Merge "Revert "Set strict_mode to true"" into main 2024-06-28 09:14:46 +00:00
Pechetty Sravani
a475258298 Revert "Set strict_mode to true"
Revert submission 3070929-strictMode+whiteList

Reason for revert: Droidmonitor created revert due to b/349925587. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3070929-strictMode%252BwhiteList

Change-Id: I2df256e81a26de4b1f4c35da5194d5aba8ae0a43
2024-06-28 05:19:16 +00:00
Treehugger Robot
759aa48b03 Merge "Use metalava's signature-to-dex subcommand" into main am: c8317181d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3151896

Change-Id: Iba9ab076960e275ef6f9d2e3353e7328ee3017eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 04:32:31 +00:00
Treehugger Robot
c8317181d0 Merge "Use metalava's signature-to-dex subcommand" into main 2024-06-28 04:17:14 +00:00
Kevin Liu
c33964c468 Merge "Set strict_mode to true" into main am: 81362a73de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070929

Change-Id: Ia4bd3569652c86cd8abbb9aa47740343507db415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 02:31:57 +00:00
Kevin Liu
81362a73de Merge "Set strict_mode to true" into main 2024-06-28 02:13:02 +00:00
Paul Duffin
78ed7f3ab6 Use metalava's signature-to-dex subcommand
Use the new `signature-to-dex` subcommand rather than the deprecated
`--dex-api` option. The subcommand is already used elsewhere and uses
basically the same code under the covers as `--dex-api`.

Bug: 307737035
Test: TH
Change-Id: I649c5eccb332c6d0993c890714245040de37540e
2024-06-28 00:13:29 +01:00
Zi Wang
33eb772f56 Merge "Use OutputFilesProvider on JavaDoc and Droiddoc" into main am: cc16023bca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150916

Change-Id: I9c03eab29134c041fac9d78156c35ba1b678700f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-27 21:46:45 +00:00
mrziwang
444762b467 Use OutputFilesProvider on platformBootclasspathModule
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: I2a5317ae92a11df0a2cb9f803121d03e16859cb2
2024-06-27 14:23:52 -07:00
mrziwang
74e5021580 Use OutputFilesProvider on JavaDoc and Droiddoc
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: If3d501a0dde0f1f00508c4e4e73ce42918b7e610
2024-06-27 10:14:24 -07: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
Spandan Das
94df13d902 Merge "Enforce that tests in MTS specify a min_sdk_version" into main 2024-06-26 02:16:05 +00: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
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
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
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
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