Revert^2 "Drop prebuilt files to android source tree."

bdb411687b119f049fdd919ab2690a6f473bad12

Change-Id: Idfb6fa8aae688f2098830a3818c25612aa7a31dd

3 files changed, 20 insertions, 191 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 5852914..a66eb3e 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1004275"
+    build_id: "T1004614"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Media"
-  git_branch: "tm-dev"
+  git_branch: "master"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index f0ef25d..3718b85 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,16 +1,5 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_import",
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-        "module_prebuilt_systemserverclasspath_fragment",
-    ],
-}
-
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
@@ -18,40 +7,11 @@ package {
 }
 
 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.media"],
@@ -78,32 +38,16 @@ 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: [
         "//frameworks/av/apex:__subpackages__",
+        "//frameworks/base",
+        "//frameworks/base/apex/media/service",
         "//packages/modules/Media/apex/framework",
     ],
     apex_available: [
@@ -116,49 +60,11 @@ module_java_import {
 }
 
 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: [
@@ -194,39 +100,11 @@ 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.media"],
@@ -252,14 +130,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 +137,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: [
@@ -294,41 +150,14 @@ license {
 }
 
 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.media"],
     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"],
-}
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index dff5839..71b9b17 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762338
\ No newline at end of file
+8949820
\ No newline at end of file