[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: afa1d1bb28 am: 33a2d30b3e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/15359434
Change-Id: I13f779d3fd493b23c8ad27a0ac653945740e0272
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 7368b6c..6e26ac6 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: "7570495"
+ build_id: "7542407"
target: "mainline_modules-user"
source_file: "mainline-sdks/wifi-module-sdk-current.zip"
}
@@ -10,10 +10,4 @@
git_project: "platform/prebuilts/module_sdk/Wifi"
git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
- transform_options {
- rename {
- from_path: "Android.bp"
- to_path: "Android.bp.auto"
- }
- }
}
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
deleted file mode 100644
index 0e28b2d..0000000
--- a/current/Android.bp.auto
+++ /dev/null
@@ -1,143 +0,0 @@
-// 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"],
-}