diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-04 02:08:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-04 02:08:34 +0000 |
| commit | 05aedc1d04857d9ae89de2776243b9cb63ad74d4 (patch) | |
| tree | 4232c419c121a41ae8a0fcc09c8b3b0482167e8f | |
| parent | ef7fac46eb73ac606ea9fd9de0b088e0f3554ba6 (diff) | |
| parent | 94d5cebc791ace3ad71677e2a4fe473f113afb8e (diff) | |
| download | IPsec-05aedc1d04857d9ae89de2776243b9cb63ad74d4.tar.gz | |
Snap for 7968112 from 94d5cebc791ace3ad71677e2a4fe473f113afb8e to sc-d2-release
Change-Id: I36f2bf6ada110d23d309054fd3dd23b2477be599
| -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", |