diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-04 02:09:10 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-04 02:09:10 +0000 |
| commit | 78f00af29541a273fd56dfd2d3a4de7cf13989ef (patch) | |
| tree | 7e7622137558834c0dd7fe88194102221cd62f34 | |
| parent | 2127f217bd6b9bd8478940d331cede0c5223a66e (diff) | |
| parent | 8c90048dbdb9b29d0c8ec99a8c62b50cd271fce1 (diff) | |
| download | Connectivity-78f00af29541a273fd56dfd2d3a4de7cf13989ef.tar.gz | |
Snap for 7968112 from 8c90048dbdb9b29d0c8ec99a8c62b50cd271fce1 to sc-v2-release
Change-Id: I0f3086cfc09cbfdeb4f568cd6fd19f9b6989be76
| -rw-r--r-- | current/Android.bp | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/current/Android.bp b/current/Android.bp index ecd10fc..f7282a9 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: 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: 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, + 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"], |