Snap for 9355375 from 47a71be10501fa200a8c37b1e65f6e2897c7dbd1 to mainline-tethering-release
Change-Id: I050abb08c26d9a8efbb7d44b4e58d9becf252a95
diff --git a/1/Android.bp b/1/Android.bp.auto
similarity index 100%
rename from 1/Android.bp
rename to 1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index a84baf4..d7ddb31 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -15,30 +15,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-prebuilt_bootclasspath_fragment {
- name: "mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current",
- sdk_member_name: "com.android.mediaprovider-bootclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.mediaprovider"],
- licenses: ["mediaprovider-module-sdk_Android-Apache-2.0@current"],
- contents: ["mediaprovider-module-sdk_framework-mediaprovider@current"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- 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.mediaprovider-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -69,43 +45,6 @@
},
}
-java_sdk_library_import {
- name: "mediaprovider-module-sdk_framework-mediaprovider@current",
- sdk_member_name: "framework-mediaprovider",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.mediaprovider",
- "test_com.android.mediaprovider",
- ],
- licenses: ["mediaprovider-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: ["android.provider"],
- public: {
- jars: ["sdk_library/public/framework-mediaprovider-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
- current_api: "sdk_library/public/framework-mediaprovider.txt",
- removed_api: "sdk_library/public/framework-mediaprovider-removed.txt",
- annotations: "sdk_library/public/framework-mediaprovider_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-mediaprovider-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-mediaprovider.srcjar"],
- current_api: "sdk_library/system/framework-mediaprovider.txt",
- removed_api: "sdk_library/system/framework-mediaprovider-removed.txt",
- annotations: "sdk_library/system/framework-mediaprovider_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-mediaprovider-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-mediaprovider.srcjar"],
- current_api: "sdk_library/module-lib/framework-mediaprovider.txt",
- removed_api: "sdk_library/module-lib/framework-mediaprovider-removed.txt",
- annotations: "sdk_library/module-lib/framework-mediaprovider_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
module_java_sdk_library_import {
name: "framework-mediaprovider",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -150,23 +89,8 @@
}
license {
- name: "mediaprovider-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: "mediaprovider-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
-
-sdk_snapshot {
- name: "mediaprovider-module-sdk@current",
- visibility: ["//visibility:public"],
- bootclasspath_fragments: ["mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current"],
- java_sdk_libs: ["mediaprovider-module-sdk_framework-mediaprovider@current"],
-}
