[automerger skipped] Re-enable prebuilt SDK am: 7c5081f6d6 -s ours
am skip reason: Merged-In I6ea9b8c5a4e9b0a831015d5f59a5a129f436b977 with SHA-1 ff78c4461e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/15578170
Change-Id: I3253bcdf93ba1281ebbaa03c1dc9680a87d13cc7
diff --git a/current/Android.bp b/current/Android.bp
index 969e5e5..f29582c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- ],
-}
-
prebuilt_bootclasspath_fragment {
name: "mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current",
sdk_member_name: "com.android.mediaprovider-bootclasspath-fragment",
@@ -31,14 +23,9 @@
},
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.mediaprovider-bootclasspath-fragment",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: ["com.android.mediaprovider"],
licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
@@ -87,14 +74,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "framework-mediaprovider",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: [
"com.android.mediaprovider",
