diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-07-28 10:03:16 +0000 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2021-07-28 12:36:08 +0000 |
| commit | 5cf011d849bb99437f1fc45088e1509fcc4adf44 (patch) | |
| tree | 1f5f6da6cc7f57859ac9e51d4fab491c9b4cbefd | |
| parent | d632b42393b8a610514140b08d06254c24cf9549 (diff) | |
| download | Connectivity-5cf011d849bb99437f1fc45088e1509fcc4adf44.tar.gz | |
Revert "Revert "Enable prebuilt SDK.""
This reverts commit d632b42393b8a610514140b08d06254c24cf9549.
Reason for revert: Resubmit with bug fixes.
Bug: 194067130
Merged-In: I210760d48bc29db17e158f3f319c2f62545a8bdc
Change-Id: Id6b0a580bb3f5eee17ec395ee63877681e897ce6
| -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 aa01c93..9b051a8 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"], @@ -78,9 +91,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"], @@ -138,9 +156,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"], |