commit aacdce0359c130010f1c03db3a148aae333c5f43
author Mathew Inwood <mathewi@google.com> Fri Dec 03 10:53:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 03 10:53:00 2021 +0000
tree a16a06e6694f49fb0c0fc570afa9abe1152dccf1
parent 6d5f4bcfb32bd8c5f2bf7201aa9705fb4de4f5b0
parent e671be88b965633b208ca4c8e1243839ac573959

Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 5ec944a069 am: e671be88b9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/1907855

Change-Id: If0ffa2a6f0160b2ecf4515b464a79e69ea0b493a

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index a416b67..543aa24 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_java_import",
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "media-module-sdk_com.android.media-bootclasspath-fragment@current",
     sdk_member_name: "com.android.media-bootclasspath-fragment",
@@ -26,9 +35,14 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.media-bootclasspath-fragment",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.media"],
     licenses: ["media-module-sdk_frameworks_av_license"],
@@ -64,9 +78,14 @@
     permitted_packages: ["android.media"],
 }
 
-java_import {
+module_java_import {
     name: "updatable-media",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: [
         "//frameworks/av/apex:__subpackages__",
         "//frameworks/base",
@@ -115,9 +134,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-media",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["//apex_available:platform"],
     licenses: ["media-module-sdk_frameworks_base_license"],
@@ -174,9 +198,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "service-media-s",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.media"],
     licenses: ["media-module-sdk_frameworks_base_license"],