diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-29 01:09:49 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-29 01:09:49 +0000 |
| commit | cc260973f1d9359bc5f065d5b49e4befbee14842 (patch) | |
| tree | 3dcb3d2e987df2d3025176e8ad16984f30372f1f | |
| parent | ddedba72d73e1087bd735050e6f70d4dcca6bbb3 (diff) | |
| parent | 076141dc72b5516c14daea7aec09aa3e7a628597 (diff) | |
| download | Connectivity-cc260973f1d9359bc5f065d5b49e4befbee14842.tar.gz | |
Snap for 7592383 from 076141dc72b5516c14daea7aec09aa3e7a628597 to sc-release
Change-Id: I32705571efd073449caaa402eb8526bd03222e55
| -rw-r--r-- | current/Android.bp | 35 | ||||
| -rwxr-xr-x[-rw-r--r--] | current/Android.bp.auto | 0 |
2 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"], diff --git a/current/Android.bp.auto b/current/Android.bp.auto index c8ecddf..c8ecddf 100644..100755 --- a/current/Android.bp.auto +++ b/current/Android.bp.auto |