Commit Graph

8513 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
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
mrziwang
68b2594524 Fix typo in outputFilesForModule error message
Test: CI
Change-Id: I41f28a0412613458a0dad132006adfbc9fbbce2c
2024-07-11 09:58:30 -07: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
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
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
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
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
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