commit 1cd449c880398a03bb4a90f883a202bd1dad86d2
author Mathew Inwood <mathewi@google.com> Tue Jul 13 14:49:33 2021 +0100
committer Mathew Inwood <mathewi@google.com> Tue Jul 13 14:49:33 2021 +0100
tree 1f5f6da6cc7f57859ac9e51d4fab491c9b4cbefd
parent 122b24dcbba01562389a199d50f25af9a62ad1d0

Enable prebuilt SDK.

Also add support for MODULES_BUILD_FROM_SOURCE for consistency with
module prebuilts.

Test: TH
Bug: 188427719
Merged-In: I243241678ca4215e21e6bb8a1148bc2137232b28
Change-Id: I7656fbb42b97498ee29466af052e8d5bec29d7bf

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index aa01c93..9b051a8 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: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
     sdk_member_name: "com.android.tethering-bootclasspath-fragment",
@@ -27,9 +35,14 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
-    prefer: false,
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -78,9 +91,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-connectivity",
-    prefer: false,
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -138,9 +156,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-tethering",
-    prefer: false,
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],