diff options
| author | Greg Kaiser <gkaiser@google.com> | 2021-07-26 20:09:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-26 20:09:17 +0000 |
| commit | 3afd59ca48a015de0dfe280a4843fbf844f4a2c5 (patch) | |
| tree | a6da7b6f3f4ef59362f4d4f633d156c3bc559f0e | |
| parent | 46e0fa50b5bd2fa4408418e07dc5b1f32f8797df (diff) | |
| parent | d632b42393b8a610514140b08d06254c24cf9549 (diff) | |
| download | Connectivity-3afd59ca48a015de0dfe280a4843fbf844f4a2c5.tar.gz | |
Merge "Revert "Enable prebuilt SDK."" into sc-dev
| -rw-r--r-- | current/Android.bp | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/current/Android.bp b/current/Android.bp index 848398b..c8ecddf 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -6,14 +6,6 @@ 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", @@ -35,14 +27,9 @@ prebuilt_bootclasspath_fragment { }, } -module_prebuilt_bootclasspath_fragment { +prebuilt_bootclasspath_fragment { name: "com.android.tethering-bootclasspath-fragment", - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, - }, + prefer: false, visibility: ["//visibility:public"], apex_available: ["com.android.tethering"], licenses: ["tethering-module-sdk_Android-Apache-2.0"], @@ -92,14 +79,9 @@ java_sdk_library_import { }, } -module_java_sdk_library_import { +java_sdk_library_import { name: "framework-connectivity", - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, - }, + prefer: false, visibility: ["//visibility:public"], apex_available: ["com.android.tethering"], licenses: ["tethering-module-sdk_Android-Apache-2.0"], @@ -159,14 +141,9 @@ java_sdk_library_import { }, } -module_java_sdk_library_import { +java_sdk_library_import { name: "framework-tethering", - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, - }, + prefer: false, visibility: ["//visibility:public"], apex_available: ["com.android.tethering"], licenses: ["tethering-module-sdk_Android-Apache-2.0"], |