summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--current/Android.bp26
1 files changed, 4 insertions, 22 deletions
diff --git a/current/Android.bp b/current/Android.bp
index 93d3c0f..380a772 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@ 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",
@@ -30,14 +22,9 @@ prebuilt_bootclasspath_fragment {
},
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: ["com.android.ipsec"],
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
@@ -85,14 +72,9 @@ java_sdk_library_import {
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "android.net.ipsec.ike",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: [
"com.android.ipsec",