diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-07-26 12:16:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-26 12:16:56 +0000 |
| commit | 46e0fa50b5bd2fa4408418e07dc5b1f32f8797df (patch) | |
| tree | 07d3f99eb815043dff5c10fd7aa65481a6b33a7b | |
| parent | 91d6f10084c36e979c0dc66d042359004fdef989 (diff) | |
| parent | 1cd449c880398a03bb4a90f883a202bd1dad86d2 (diff) | |
| download | Connectivity-46e0fa50b5bd2fa4408418e07dc5b1f32f8797df.tar.gz | |
Merge "Enable prebuilt SDK." into sc-dev
| -rw-r--r-- | current/Android.bp | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/current/Android.bp b/current/Android.bp index c8ecddf..848398b 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -6,6 +6,14 @@ package { 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 { }, } -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"], @@ -79,9 +92,14 @@ java_sdk_library_import { }, } -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"], @@ -141,9 +159,14 @@ java_sdk_library_import { }, } -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"], |