Snap for 7652338 from 076dee05192501621104b5104bcae5d4ae219d43 to mainline-wifi-release
Change-Id: Iee617f13b756642495964a1e18cf986f9d5cecfd
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index bdd3ad0..b301013 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: "7548924"
+ build_id: "7611331"
target: "mainline_modules-user"
source_file: "mainline-sdks/wifi-module-sdk-current.zip"
}
@@ -11,6 +11,9 @@
git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
transform_options {
- exclude: "Android.bp"
+ 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 d47e740..0e28b2d 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -54,6 +54,11 @@
],
licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
shared_library: false,
+ permitted_packages: [
+ "android.hardware.wifi",
+ "android.net.wifi",
+ "com.android.wifi.x",
+ ],
public: {
jars: ["sdk_library/public/framework-wifi-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
@@ -87,6 +92,11 @@
],
licenses: ["wifi-module-sdk_Android-Apache-2.0"],
shared_library: false,
+ permitted_packages: [
+ "android.hardware.wifi",
+ "android.net.wifi",
+ "com.android.wifi.x",
+ ],
public: {
jars: ["sdk_library/public/framework-wifi-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..0e28b2d
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,143 @@
+// 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: "wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current",
+ sdk_member_name: "com.android.wifi-bootclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.wifi"],
+ licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
+ contents: ["wifi-module-sdk_framework-wifi@current"],
+ hidden_api: {
+ unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+ max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
+ max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+ 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.wifi-bootclasspath-fragment",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.wifi"],
+ licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+ contents: ["framework-wifi"],
+ hidden_api: {
+ unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+ max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
+ max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+ 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: "wifi-module-sdk_framework-wifi@current",
+ sdk_member_name: "framework-wifi",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.wifi",
+ "test_com.android.wifi",
+ ],
+ licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
+ shared_library: false,
+ permitted_packages: [
+ "android.hardware.wifi",
+ "android.net.wifi",
+ "com.android.wifi.x",
+ ],
+ public: {
+ jars: ["sdk_library/public/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
+ current_api: "sdk_library/public/framework-wifi.txt",
+ removed_api: "sdk_library/public/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
+ current_api: "sdk_library/system/framework-wifi.txt",
+ removed_api: "sdk_library/system/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
+ current_api: "sdk_library/module-lib/framework-wifi.txt",
+ removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "framework-wifi",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.wifi",
+ "test_com.android.wifi",
+ ],
+ licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+ shared_library: false,
+ permitted_packages: [
+ "android.hardware.wifi",
+ "android.net.wifi",
+ "com.android.wifi.x",
+ ],
+ public: {
+ jars: ["sdk_library/public/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
+ current_api: "sdk_library/public/framework-wifi.txt",
+ removed_api: "sdk_library/public/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
+ current_api: "sdk_library/system/framework-wifi.txt",
+ removed_api: "sdk_library/system/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
+ current_api: "sdk_library/module-lib/framework-wifi.txt",
+ removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+license {
+ name: "wifi-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: "wifi-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: "wifi-module-sdk@current",
+ visibility: ["//visibility:public"],
+ bootclasspath_fragments: ["wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current"],
+ java_sdk_libs: ["wifi-module-sdk_framework-wifi@current"],
+}
diff --git a/current/sdk_library/public/framework-wifi.srcjar b/current/sdk_library/public/framework-wifi.srcjar
index feb5088..a728ff5 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
