commit 5c3097be5564282d77f2e6b00897378b0f415c68
author Mathew Inwood <mathewi@google.com> Tue Jul 13 14:49:23 2021 +0100
committer Dario Freni <dariofreni@google.com> Thu Dec 02 19:49:45 2021 +0000
tree 86e63ecc6d7baa6a23de642eba967df842ff20d7
parent 2b466a0330a32ec0a253d55fe16d53e9510453fa

Add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.

Test: TH
Bug: 208757970
Merged-In: I66a0ffd2cc6fbcf65441b19dceca6c9edea94d42
Change-Id: I66a0ffd2cc6fbcf65441b19dceca6c9edea94d42
(cherry picked from commit 3011d9823793fd21b3eb351ce300e826d8f18e81)

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 0ea377e..c7626d3 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: "sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current",
     sdk_member_name: "com.android.sdkext-bootclasspath-fragment",
@@ -22,9 +30,14 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.sdkext-bootclasspath-fragment",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
     apex_available: ["com.android.sdkext"],
     licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
@@ -72,9 +85,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-sdkextensions",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.sdkext",