Snap for 7627094 from ec7e280637927bf811c4148eb12befb09443c2ad to mainline-permission-release
Change-Id: Iaabfedd49002e6d5a96d75403725f13e097f5e48
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index fde13d4..68dc6cc 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "7542407"
+ build_id: "7611331"
target: "mainline_modules-user"
source_file: "mainline-sdks/ipsec-module-sdk-current.zip"
}
@@ -10,4 +10,10 @@
git_project: "platform/prebuilts/module_sdk/IPsec"
git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
+ transform_options {
+ rename {
+ from_path: "Android.bp"
+ to_path: "Android.bp.auto"
+ }
+ }
}
diff --git a/OWNERS b/OWNERS
index 8b6675a..b4de908 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,3 @@
include platform/packages/modules/common:/OWNERS
+
+include platform/packages/modules/common:/PREBUILTS_MODULE_OWNERS
diff --git a/current/Android.bp b/current/Android.bp
index 380a772..124fb56 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -49,6 +49,11 @@
licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"],
shared_library: true,
compile_dex: true,
+ permitted_packages: [
+ "com.android.internal.net",
+ "android.net.ipsec.ike",
+ "android.net.eap",
+ ],
public: {
jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
@@ -83,6 +88,11 @@
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
shared_library: true,
compile_dex: true,
+ permitted_packages: [
+ "com.android.internal.net",
+ "android.net.ipsec.ike",
+ "android.net.eap",
+ ],
public: {
jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..124fb56
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,139 @@
+// This is auto-generated. DO NOT EDIT.
+
+package {
+ // A default list here prevents the license LSC from adding its own list which would
+ // be unnecessary as every module in the sdk already has its own licenses property.
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_bootclasspath_fragment {
+ name: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current",
+ sdk_member_name: "com.android.ipsec-bootclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.ipsec"],
+ licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"],
+ contents: ["ipsec-module-sdk_android.net.ipsec.ike@current"],
+ hidden_api: {
+ stub_flags: "hiddenapi/stub-flags.csv",
+ annotation_flags: "hiddenapi/annotation-flags.csv",
+ metadata: "hiddenapi/metadata.csv",
+ index: "hiddenapi/index.csv",
+ all_flags: "hiddenapi/all-flags.csv",
+ },
+}
+
+prebuilt_bootclasspath_fragment {
+ name: "com.android.ipsec-bootclasspath-fragment",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.ipsec"],
+ licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
+ contents: ["android.net.ipsec.ike"],
+ hidden_api: {
+ stub_flags: "hiddenapi/stub-flags.csv",
+ annotation_flags: "hiddenapi/annotation-flags.csv",
+ metadata: "hiddenapi/metadata.csv",
+ index: "hiddenapi/index.csv",
+ all_flags: "hiddenapi/all-flags.csv",
+ },
+}
+
+java_sdk_library_import {
+ name: "ipsec-module-sdk_android.net.ipsec.ike@current",
+ sdk_member_name: "android.net.ipsec.ike",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.ipsec",
+ "test_com.android.ipsec",
+ ],
+ licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"],
+ shared_library: true,
+ compile_dex: true,
+ permitted_packages: [
+ "com.android.internal.net",
+ "android.net.ipsec.ike",
+ "android.net.eap",
+ ],
+ public: {
+ jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/public/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/system/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "android.net.ipsec.ike",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.ipsec",
+ "test_com.android.ipsec",
+ ],
+ licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
+ shared_library: true,
+ compile_dex: true,
+ permitted_packages: [
+ "com.android.internal.net",
+ "android.net.ipsec.ike",
+ "android.net.eap",
+ ],
+ public: {
+ jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/public/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/system/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
+ current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
+ removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+license {
+ name: "ipsec-module-sdk_Android-Apache-2.0@current",
+ sdk_member_name: "Android-Apache-2.0",
+ visibility: ["//visibility:private"],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+license {
+ name: "ipsec-module-sdk_Android-Apache-2.0",
+ visibility: ["//visibility:private"],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+sdk_snapshot {
+ name: "ipsec-module-sdk@current",
+ visibility: ["//visibility:public"],
+ bootclasspath_fragments: ["ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current"],
+ java_sdk_libs: ["ipsec-module-sdk_android.net.ipsec.ike@current"],
+}
