diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-07-13 14:49:28 +0100 |
|---|---|---|
| committer | Dario Freni <dariofreni@google.com> | 2021-12-02 16:59:02 +0000 |
| commit | 94d5cebc791ace3ad71677e2a4fe473f113afb8e (patch) | |
| tree | 4232c419c121a41ae8a0fcc09c8b3b0482167e8f | |
| parent | 93741b241947ea612e61b4860df582efd8ce0b52 (diff) | |
| download | IPsec-94d5cebc791ace3ad71677e2a4fe473f113afb8e.tar.gz | |
Add support for MODULES_BUILD_FROM_SOURCE for consistency withandroid12L-dev
module prebuilts.
Test: TH
Bug: 208757970
Merged-In: I27f7c0aeaaa2bed69fcff892cc8bfc808db1b54b
Change-Id: I27f7c0aeaaa2bed69fcff892cc8bfc808db1b54b
(cherry picked from commit e5eaec03bf0d483f64a3ff7991da6e12a46684ac)
| -rw-r--r-- | current/Android.bp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/current/Android.bp b/current/Android.bp index ffb11f1..6b21395 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: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current", sdk_member_name: "com.android.ipsec-bootclasspath-fragment", @@ -22,9 +30,14 @@ prebuilt_bootclasspath_fragment { }, } -prebuilt_bootclasspath_fragment { +module_prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", prefer: true, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], licenses: ["ipsec-module-sdk_Android-Apache-2.0"], @@ -77,9 +90,14 @@ java_sdk_library_import { }, } -java_sdk_library_import { +module_java_sdk_library_import { name: "android.net.ipsec.ike", prefer: true, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: [ "com.android.ipsec", |