commit ccb5c382dfa87062d478bffae67fedfd6de64041
author Mathew Inwood <mathewi@google.com> Tue Jul 13 14:49:17 2021 +0100
committer Dario Freni <dariofreni@google.com> Thu Dec 02 19:12:43 2021 +0000
tree 1a479a63b95478e20834a260cadc0b664fd2cdcb
parent 19ed3476f21756b6bc152553da373e01fd113ddb

Add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.

Test: TH
Bug: 208757970
Change-Id: I380f238cf6106b9cf2e2cb94ae0620deeaacb987
(cherry picked from commit 77bf21ec629b9a2f0f94d768a8e3b3f499f050ba)

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 49062d1..cc238dc 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: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
     licenses: ["scheduling-sdk_Android-Apache-2.0"],
@@ -72,9 +85,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-scheduling",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
     licenses: ["scheduling-sdk_Android-Apache-2.0"],