Snap for 9368510 from 52bb875793b481386ddac8aa4681b1ba48d82770 to mainline-sdkext-releaseaml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000android13-mainline-sdkext-release

Change-Id: Idc1f88e422ecd3bec585c3b68be743eef6e8bc8c

2 files changed, 0 insertions, 152 deletions

diff --git a/1/Android.bp b/1/Android.bp.auto
index 7ca3440..7ca3440 100644
--- a/1/Android.bp
+++ b/1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index f0ef25d..50d0326 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -17,33 +17,6 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-prebuilt_bootclasspath_fragment {
-    name: "media-module-sdk_com.android.media-bootclasspath-fragment@current",
-    sdk_member_name: "com.android.media-bootclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.media"],
-    licenses: ["media-module-sdk_frameworks_av_license@current"],
-    contents: ["media-module-sdk_updatable-media@current"],
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-    api: {
-        stub_libs: ["media-module-sdk_framework-media@current"],
-    },
-    hidden_api: {
-        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        signature_patterns: "hiddenapi/signature-patterns.csv",
-        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
-        filtered_flags: "hiddenapi/filtered-flags.csv",
-    },
-}
-
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.media-bootclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -77,22 +50,6 @@ module_prebuilt_bootclasspath_fragment {
     },
 }
 
-java_import {
-    name: "media-module-sdk_updatable-media@current",
-    sdk_member_name: "updatable-media",
-    visibility: [
-        "//frameworks/av/apex:__subpackages__",
-        "//packages/modules/Media/apex/framework",
-    ],
-    apex_available: [
-        "com.android.media",
-        "test_com.android.media",
-    ],
-    licenses: ["media-module-sdk_Android-Apache-2.0@current"],
-    jars: ["java_boot_libs/snapshot/jars/are/invalid/updatable-media.jar"],
-    permitted_packages: ["android.media"],
-}
-
 module_java_import {
     name: "updatable-media",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -115,42 +72,6 @@ module_java_import {
     permitted_packages: ["android.media"],
 }
 
-java_sdk_library_import {
-    name: "media-module-sdk_framework-media@current",
-    sdk_member_name: "framework-media",
-    visibility: ["//visibility:public"],
-    apex_available: [
-        "com.android.media",
-        "test_com.android.media",
-    ],
-    licenses: ["media-module-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    public: {
-        jars: ["sdk_library/public/framework-media-stubs.jar"],
-        stub_srcs: ["sdk_library/public/framework-media.srcjar"],
-        current_api: "sdk_library/public/framework-media.txt",
-        removed_api: "sdk_library/public/framework-media-removed.txt",
-        annotations: "sdk_library/public/framework-media_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["sdk_library/system/framework-media-stubs.jar"],
-        stub_srcs: ["sdk_library/system/framework-media.srcjar"],
-        current_api: "sdk_library/system/framework-media.txt",
-        removed_api: "sdk_library/system/framework-media-removed.txt",
-        annotations: "sdk_library/system/framework-media_annotations.zip",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-media-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/framework-media.srcjar"],
-        current_api: "sdk_library/module-lib/framework-media.txt",
-        removed_api: "sdk_library/module-lib/framework-media-removed.txt",
-        annotations: "sdk_library/module-lib/framework-media_annotations.zip",
-        sdk_version: "module_current",
-    },
-}
-
 module_java_sdk_library_import {
     name: "framework-media",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -193,32 +114,6 @@ module_java_sdk_library_import {
     },
 }
 
-java_sdk_library_import {
-    name: "media-module-sdk_service-media-s@current",
-    sdk_member_name: "service-media-s",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.media"],
-    licenses: ["media-module-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: ["com.android.server.media"],
-    public: {
-        jars: ["sdk_library/public/service-media-s-stubs.jar"],
-        stub_srcs: ["sdk_library/public/service-media-s.srcjar"],
-        current_api: "sdk_library/public/service-media-s.txt",
-        removed_api: "sdk_library/public/service-media-s-removed.txt",
-        annotations: "sdk_library/public/service-media-s_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system_server: {
-        jars: ["sdk_library/system-server/service-media-s-stubs.jar"],
-        stub_srcs: ["sdk_library/system-server/service-media-s.srcjar"],
-        current_api: "sdk_library/system-server/service-media-s.txt",
-        removed_api: "sdk_library/system-server/service-media-s-removed.txt",
-        annotations: "sdk_library/system-server/service-media-s_annotations.zip",
-        sdk_version: "system_server_current",
-    },
-}
-
 module_java_sdk_library_import {
     name: "service-media-s",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -252,14 +147,6 @@ module_java_sdk_library_import {
 }
 
 license {
-    name: "media-module-sdk_Android-Apache-2.0@current",
-    sdk_member_name: "Android-Apache-2.0",
-    visibility: ["//visibility:private"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
     name: "media-module-sdk_Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -267,20 +154,6 @@ license {
 }
 
 license {
-    name: "media-module-sdk_frameworks_av_license@current",
-    sdk_member_name: "frameworks_av_license",
-    visibility: ["//visibility:private"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-Unicode-DFS",
-        "legacy_by_exception_only",
-    ],
-    license_text: ["licenses/frameworks/av/NOTICE"],
-}
-
-license {
     name: "media-module-sdk_frameworks_av_license",
     visibility: ["//visibility:private"],
     license_kinds: [
@@ -293,15 +166,6 @@ license {
     license_text: ["licenses/frameworks/av/NOTICE"],
 }
 
-prebuilt_systemserverclasspath_fragment {
-    name: "media-module-sdk_com.android.media-systemserverclasspath-fragment@current",
-    sdk_member_name: "com.android.media-systemserverclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.media"],
-    licenses: ["media-module-sdk_frameworks_av_license@current"],
-    contents: ["media-module-sdk_service-media-s@current"],
-}
-
 module_prebuilt_systemserverclasspath_fragment {
     name: "com.android.media-systemserverclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -316,19 +180,3 @@ module_prebuilt_systemserverclasspath_fragment {
     licenses: ["media-module-sdk_frameworks_av_license"],
     contents: ["service-media-s"],
 }
-
-sdk_snapshot {
-    name: "media-module-sdk@current",
-    visibility: [
-        "//packages/modules/Media/apex:__subpackages__",
-        "//frameworks/av/apex",
-        "//frameworks/av/apex/testing",
-    ],
-    bootclasspath_fragments: ["media-module-sdk_com.android.media-bootclasspath-fragment@current"],
-    java_boot_libs: ["media-module-sdk_updatable-media@current"],
-    java_sdk_libs: [
-        "media-module-sdk_framework-media@current",
-        "media-module-sdk_service-media-s@current",
-    ],
-    systemserverclasspath_fragments: ["media-module-sdk_com.android.media-systemserverclasspath-fragment@current"],
-}