From df71d926a72ef5caacdbaac51f80c85a502c7e9a Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 13 Jul 2021 14:49:28 +0100 Subject: Enable prebuilt SDK. Also add support for MODULES_BUILD_FROM_SOURCE for consistency with module prebuilts. Test: TH Bug: 188427719 Merged-In: I82a541f7c8cf2e63a9ba3f6f6fd315770e9ffeb7 Change-Id: I27f7c0aeaaa2bed69fcff892cc8bfc808db1b54b --- current/Android.bp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/current/Android.bp b/current/Android.bp index 380a772..93d3c0f 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, + 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"], @@ -72,9 +85,14 @@ java_sdk_library_import { }, } -java_sdk_library_import { +module_java_sdk_library_import { name: "android.net.ipsec.ike", - prefer: false, + prefer: true, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: [ "com.android.ipsec", -- cgit v1.2.3