diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-07-28 10:03:16 +0000 |
|---|---|---|
| committer | Dario Freni <dariofreni@google.com> | 2021-12-02 19:09:13 +0000 |
| commit | 8c90048dbdb9b29d0c8ec99a8c62b50cd271fce1 (patch) | |
| tree | 7e7622137558834c0dd7fe88194102221cd62f34 | |
| parent | e48451f579525af9d206777df604b598686d6eac (diff) | |
| download | Connectivity-android12L-dev.tar.gz | |
Add support for MODULES_BUILD_FROM_SOURCE for consistency withandroid12L-dev
module prebuilts.
Test: TH
Bug: 208757970
Merged-In: Id6b0a580bb3f5eee17ec395ee63877681e897ce6
Change-Id: Id6b0a580bb3f5eee17ec395ee63877681e897ce6
(cherry picked from commit 7ce695ca8ade483aa7c6ceeb40d2b786aa02d542)
| -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"], |