summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-04 04:10:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-04 04:10:32 +0000
commit32d7297d40bbbbc59b0b8d26167e206c52f9e99b (patch)
tree46a774d2e9a659eec328f11590206c4510157d4d
parentbde04c35d4a92e13057654c1281c3006dc89a23e (diff)
parente16fea38210b9348f13d374d8cee33f89b84486c (diff)
downloadMediaProvider-32d7297d40bbbbc59b0b8d26167e206c52f9e99b.tar.gz
Snap for 7968957 from e16fea38210b9348f13d374d8cee33f89b84486c to tm-release
Change-Id: I735bbf41556c5129d2d081e317d5d14ee207140b
-rw-r--r--current/Android.bp22
1 files changed, 20 insertions, 2 deletions
diff --git a/current/Android.bp b/current/Android.bp
index c0e4638..3bafaf2 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,6 +6,14 @@ package {
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",
@@ -23,9 +31,14 @@ prebuilt_bootclasspath_fragment {
},
}
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
name: "com.android.mediaprovider-bootclasspath-fragment",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.mediaprovider"],
licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
@@ -76,9 +89,14 @@ java_sdk_library_import {
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-mediaprovider",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.mediaprovider",