Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 5a5367588d am: 4f20ab4153 am: 8edae27689
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/1907884
Change-Id: I882bbc9ebceb9c41ed67379d9fed6f7352f00295
diff --git a/current/Android.bp b/current/Android.bp
index 20a7bb6..ea0b027 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_cc_prebuilt_library_shared",
+ "module_java_sdk_library_import",
+ "module_prebuilt_bootclasspath_fragment",
+ ],
+}
+
prebuilt_bootclasspath_fragment {
name: "statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current",
sdk_member_name: "com.android.os.statsd-bootclasspath-fragment",
@@ -23,9 +32,14 @@
},
}
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
name: "com.android.os.statsd-bootclasspath-fragment",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
@@ -82,9 +96,14 @@
},
}
-java_sdk_library_import {
+module_java_sdk_library_import {
name: "framework-statsd",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
@@ -175,9 +194,14 @@
},
}
-cc_prebuilt_library_shared {
+module_cc_prebuilt_library_shared {
name: "libstatssocket",
prefer: false,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.bluetooth.updatable",