diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-12-02 18:30:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-02 18:30:13 +0000 |
| commit | 6dfc6fa819555b57c590e0984833addaf0d518bb (patch) | |
| tree | 73792858671764b0a9dead016949f39a645b299c | |
| parent | 9d74d27c05e36695e877da0dd6d986dbf03bbf98 (diff) | |
| parent | 7bf48973b660b9def57af8b1bcc7eadcd34fa681 (diff) | |
| download | IPsec-6dfc6fa819555b57c590e0984833addaf0d518bb.tar.gz | |
Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: e5eaec03bf am: 2a4794ae24 am: 791fb7b754 am: 7bf48973b6
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/IPsec/+/1909179
Change-Id: I4f1fecaeb04f68f061f33728dad6951aff7c731e
| -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 0d1426e..8611b99 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: false, + 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"], @@ -75,9 +88,14 @@ java_sdk_library_import { }, } -java_sdk_library_import { +module_java_sdk_library_import { name: "android.net.ipsec.ike", prefer: false, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: [ "com.android.ipsec", |