diff options
| author | 2023-09-22 08:58:51 +0000 | |
|---|---|---|
| committer | 2023-09-22 08:58:51 +0000 | |
| commit | 41b6aba200170fa82a6b1434fee3d87040537949 (patch) | |
| tree | a3a1af686d5287eddfa292d1bce0f43e1a7145f1 | |
| parent | a58869b728194af9af761585faa960267042790f (diff) | |
| parent | f50a02c390906bde2335c498538c7273f0c578f2 (diff) | |
Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb62b am: 0275f893c2 am: 48567b752e am: f50a02c390
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286
Change-Id: I7180de66726e9d35d778ad6af3d1cccd50efb617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AconfigFlags.bp | 23 | ||||
| -rw-r--r-- | api/StubLibraries.bp | 3 |
2 files changed, 18 insertions, 8 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 55f5436eed90..8670b4db2a5a 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -12,20 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. +aconfig_srcjars = [ + ":android.os.flags-aconfig-java{.generated_srcjars}", + ":android.security.flags-aconfig-java{.generated_srcjars}", + ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}", + ":com.android.window.flags.window-aconfig-java{.generated_srcjars}", + ":com.android.hardware.input-aconfig-java{.generated_srcjars}", + ":com.android.text.flags-aconfig-java{.generated_srcjars}", +] + +filegroup { + name: "framework-minus-apex-aconfig-srcjars", + srcs: aconfig_srcjars, +} + // Aconfig declarations and libraries for the core framework java_defaults { name: "framework-minus-apex-aconfig-libraries", // Add java_aconfig_libraries to here to add them to the core framework - srcs: [ - ":android.os.flags-aconfig-java{.generated_srcjars}", - ":android.security.flags-aconfig-java{.generated_srcjars}", - ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}", - ":com.android.window.flags.window-aconfig-java{.generated_srcjars}", - ":com.android.hardware.input-aconfig-java{.generated_srcjars}", - ":com.android.text.flags-aconfig-java{.generated_srcjars}", - ], // Add aconfig-annotations-lib as a dependency for the optimization + srcs: aconfig_srcjars, libs: ["aconfig-annotations-lib"], } diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 9a0053f8add6..6eb6ed9bd18e 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -29,6 +29,9 @@ droidstubs { name: "api-stubs-docs-non-updatable", + srcs: [ + ":framework-minus-apex-aconfig-srcjars", + ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", |