Add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.
Test: TH
Bug: 208757970
Change-Id: I6accb42c56a22516e4be82244d0047867b771a51
(cherry picked from commit 526759d0ef80a4a484d6c646d7223dfd5ac3e725)
diff --git a/current/Android.bp b/current/Android.bp
index 3fb123c..d0eccdd 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,6 +6,14 @@
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: "permission-module-sdk_com.android.permission-bootclasspath-fragment@current",
sdk_member_name: "com.android.permission-bootclasspath-fragment",
@@ -25,9 +33,14 @@
},
}
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
name: "com.android.permission-bootclasspath-fragment",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.permission"],
licenses: ["permission-module-sdk_Android-Apache-2.0"],
@@ -84,9 +97,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-permission",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.permission",
@@ -165,9 +183,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-permission-s",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.permission",
@@ -234,9 +257,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "service-permission",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.permission",