Snap for 7968112 from 41823664d6c917a5a91398658da9900aff894be8 to sc-v2-release
Change-Id: I2fd9f91609f530f8f7b45ae8d135147d8846e2bf
diff --git a/current/Android.bp b/current/Android.bp
index 604b606..02e8368 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: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
@@ -22,9 +30,14 @@
},
}
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
name: "com.android.scheduling-bootclasspath-fragment",
prefer: true,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
@@ -69,9 +82,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-scheduling",
prefer: true,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
