Add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.
Test: TH
Bug: 208757970
Merged-In: I0bffa6b804a1c1fea1236947380d395b5f746d60
Change-Id: I0bffa6b804a1c1fea1236947380d395b5f746d60
(cherry picked from commit 5ec944a0699343a0e2621b53ba7de22eb14c31ed)
diff --git a/current/Android.bp b/current/Android.bp
index 728cef5..375a185 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,6 +6,15 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+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",
+ ],
+}
+
prebuilt_bootclasspath_fragment {
name: "media-module-sdk_com.android.media-bootclasspath-fragment@current",
sdk_member_name: "com.android.media-bootclasspath-fragment",
@@ -26,9 +35,14 @@
},
}
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
name: "com.android.media-bootclasspath-fragment",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.media"],
licenses: ["media-module-sdk_frameworks_av_license"],
@@ -64,9 +78,14 @@
permitted_packages: ["android.media"],
}
-java_import {
+module_java_import {
name: "updatable-media",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: [
"//frameworks/av/apex:__subpackages__",
"//frameworks/base",
@@ -112,9 +131,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-media",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["media-module-sdk_frameworks_base_license"],
@@ -166,9 +190,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "service-media-s",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.media"],
licenses: ["media-module-sdk_frameworks_base_license"],