commit 8149bd9e7a36ab832a1f607cc3477b64cbc9a752
author Mathew Inwood <mathewi@google.com> Tue Jul 13 14:49:43 2021 +0100
committer Dario Freni <dariofreni@google.com> Thu Dec 02 19:47:38 2021 +0000
tree fb092668c5f0f5dcb410ff481ca88eb36f273c59
parent 85e43aa651fe26c9916d3061657deba32590c3f7

Add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.

Test: TH
Bug: 208757970
Merged-In: Ie8f088ed078e88aab77b963cf34d7975ffff913d
Change-Id: Ie8f088ed078e88aab77b963cf34d7975ffff913d
(cherry picked from commit 41b7a097bae29ee3d19735e1e26c8202c7ad7f5f)

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index bf3600d..969e5e5 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: "mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current",
     sdk_member_name: "com.android.mediaprovider-bootclasspath-fragment",
@@ -23,9 +31,14 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.mediaprovider-bootclasspath-fragment",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.mediaprovider"],
     licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
@@ -74,9 +87,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-mediaprovider",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.mediaprovider",