diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-05 07:20:02 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-05 07:20:02 +0000 |
| commit | a7b3b95a1b194d0fb25dbc49b9e7df9f7e9bac52 (patch) | |
| tree | 7ad52453ac9a81b7e8aff813642d25bf9f940551 | |
| parent | 75dc0d6773f72b89ab5ef85e1e63ad14c7f39ee3 (diff) | |
| parent | d851e9491f5712d73211b6b6af40a60100522c58 (diff) | |
| download | common-a7b3b95a1b194d0fb25dbc49b9e7df9f7e9bac52.tar.gz | |
Snap for 11053320 from d851e9491f5712d73211b6b6af40a60100522c58 to mainline-rkpd-releaseaml_rkp_341311000
Change-Id: I97865d7567299dbb065f1fe3354985f9c731a131
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | PREBUILTS_MODULE_OWNERS | 2 | ||||
| -rw-r--r-- | build/allowed_deps.txt | 5 | ||||
| -rw-r--r-- | sdk/ModuleDefaults.bp | 15 |
4 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,4 @@ +# Bug component: 819107 # Mainline modularization team amhk@google.com diff --git a/PREBUILTS_MODULE_OWNERS b/PREBUILTS_MODULE_OWNERS index 1b07d0e2..064f1599 100644 --- a/PREBUILTS_MODULE_OWNERS +++ b/PREBUILTS_MODULE_OWNERS @@ -18,3 +18,5 @@ robertogil@google.com #{LAST_RESORT_SUGGESTION} paulduffin@google.com #{LAST_RESORT_SUGGESTION} amhk@google.com #{LAST_RESORT_SUGGESTION} gurpreetgs@google.com #{LAST_RESORT_SUGGESTION} +hsnali@google.com #{LAST_RESORT_SUGGESTION} +kalyssa@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 692022ba..c444d466 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -472,6 +472,7 @@ libcodec2_soft_amrnbdec(minSdkVersion:29) libcodec2_soft_amrnbenc(minSdkVersion:29) libcodec2_soft_amrwbdec(minSdkVersion:29) libcodec2_soft_amrwbenc(minSdkVersion:29) +libcodec2_soft_av1dec_dav1d(minSdkVersion:29) libcodec2_soft_av1dec_gav1(minSdkVersion:29) libcodec2_soft_av1enc(minSdkVersion:29) libcodec2_soft_avcdec(minSdkVersion:29) @@ -514,6 +515,9 @@ libcutils_headers(minSdkVersion:29) libcutils_sockets(minSdkVersion:29) libcxx(minSdkVersion:29) libcxxbridge05(minSdkVersion:29) +libdav1d(minSdkVersion:29) +libdav1d_16bit(minSdkVersion:29) +libdav1d_8bit(minSdkVersion:29) libdexfile_external_headers(minSdkVersion:31) libdexfile_support(minSdkVersion:31) libdiagnose_usb(minSdkVersion:(no version)) @@ -702,6 +706,7 @@ libopus(minSdkVersion:29) libpanic_abort.rust_sysroot(minSdkVersion:29) libparking_lot(minSdkVersion:29) libparking_lot_core(minSdkVersion:29) +libpdl_runtime(minSdkVersion:33) libpercent_encoding(minSdkVersion:29) libperfetto_client_experimental(minSdkVersion:30) libperfetto_client_experimental(minSdkVersion:S) diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index af91f2c9..2ee0d955 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -17,13 +17,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -mainline_stubs_args = - "--error UnhiddenSystemApi " + - "--hide CallbackInterface " + - "--hide HiddenTypedefConstant " + - "--hide RequiresPermission " + - "--enhance-documentation " - // Defaults common to all mainline module java_sdk_library instances. java_defaults { name: "framework-module-common-defaults", @@ -65,7 +58,13 @@ java_defaults { installable: false, // Configure framework module specific metalava options. - droiddoc_options: [mainline_stubs_args], + droiddoc_options: [ + "--error UnhiddenSystemApi", + "--hide CallbackInterface", + "--hide HiddenTypedefConstant", + "--hide RequiresPermission", + "--enhance-documentation", + ], annotations_enabled: true, |