DO NOT MERGE: Enable Prebuilt SDK
Test: presubmit
Bug: 215375351
Merged-In: I8cd70ac886d6c63eddbccfdb25f665d46a368745
Change-Id: Ibaffd6ebabe20479217bf8b01aaebc864c25c1e6
diff --git a/current/Android.bp b/current/Android.bp
index 8cda5fe..5adb6a4 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: "permission-module-sdk_com.android.permission-bootclasspath-fragment@current",
sdk_member_name: "com.android.permission-bootclasspath-fragment",
@@ -35,6 +36,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.permission-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: {
@@ -96,6 +98,7 @@
module_java_sdk_library_import {
name: "framework-permission",
+ // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
@@ -176,7 +179,8 @@
module_java_sdk_library_import {
name: "framework-permission-s",
- 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,
@@ -245,7 +249,8 @@
module_java_sdk_library_import {
name: "service-permission",
- 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,