commit b3a7f4c2817519e8576729b5a7725d96ecaa7e56
author Dario Freni <dariofreni@google.com> Thu Jan 27 19:10:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 28 22:46:33 2022 +0000
tree 9b29c1de32b4e1081a57fded11a84b07b7aa0b1d
parent 0642af7e856feaac284f1e10c13e6ab0c1a1d8e0

DO NOT MERGE: Enable Prebuilt SDK

Test: presubmit
Bug: 215375351
Merged-In: Id6b0a580bb3f5eee17ec395ee63877681e897ce6
Change-Id: Ib7cc05161e146c33813f0a60ed994168e7bbb856
(cherry picked from commit b12f69cd8ed2e6655ab69e4c2be44cb20ce96b6a)
Merged-In:Ib7cc05161e146c33813f0a60ed994168e7bbb856

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index f7282a9..7371c7c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,11 +1,6 @@
 // This is auto-generated. DO NOT EDIT.
 
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
 soong_config_module_type_import {
     from: "packages/modules/common/Android.bp",
     module_types: [
@@ -14,6 +9,12 @@
     ],
 }
 
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
     sdk_member_name: "com.android.tethering-bootclasspath-fragment",
@@ -37,6 +38,7 @@
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -94,6 +96,7 @@
 
 module_java_sdk_library_import {
     name: "framework-connectivity",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -161,7 +164,8 @@
 
 module_java_sdk_library_import {
     name: "framework-tethering",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,