diff options
Diffstat (limited to 'current/Android.bp')
| -rw-r--r-- | current/Android.bp | 18 |
1 files changed, 11 insertions, 7 deletions
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 @@ soong_config_module_type_import { ], } +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 @@ prebuilt_bootclasspath_fragment { 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 @@ java_sdk_library_import { 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 @@ java_sdk_library_import { 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, |