Snap for 9344905 from 0d8b3fec9cb182f385251a873ee53a6201caa719 to mainline-wifi-release
Change-Id: Ibfc83fdcadc0604b33a4cf963f430e2d1b37831a
diff --git a/1/Android.bp b/1/Android.bp.auto
similarity index 100%
rename from 1/Android.bp
rename to 1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index e7e06fe..e02101c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -16,32 +16,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-prebuilt_bootclasspath_fragment {
- name: "permission-module-sdk_com.android.permission-bootclasspath-fragment@current",
- sdk_member_name: "com.android.permission-bootclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.permission"],
- licenses: ["permission-module-sdk_Android-Apache-2.0@current"],
- contents: [
- "permission-module-sdk_framework-permission@current",
- "permission-module-sdk_framework-permission-s@current",
- ],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- hidden_api: {
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
module_prebuilt_bootclasspath_fragment {
name: "com.android.permission-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -74,46 +48,6 @@
},
}
-java_sdk_library_import {
- name: "permission-module-sdk_framework-permission@current",
- sdk_member_name: "framework-permission",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.permission",
- "test_com.android.permission",
- ],
- licenses: ["permission-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: [
- "android.permission",
- "android.app.role",
- ],
- public: {
- jars: ["sdk_library/public/framework-permission-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-permission.srcjar"],
- current_api: "sdk_library/public/framework-permission.txt",
- removed_api: "sdk_library/public/framework-permission-removed.txt",
- annotations: "sdk_library/public/framework-permission_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-permission-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-permission.srcjar"],
- current_api: "sdk_library/system/framework-permission.txt",
- removed_api: "sdk_library/system/framework-permission-removed.txt",
- annotations: "sdk_library/system/framework-permission_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-permission-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-permission.srcjar"],
- current_api: "sdk_library/module-lib/framework-permission.txt",
- removed_api: "sdk_library/module-lib/framework-permission-removed.txt",
- annotations: "sdk_library/module-lib/framework-permission_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
module_java_sdk_library_import {
name: "framework-permission",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -160,48 +94,6 @@
},
}
-java_sdk_library_import {
- name: "permission-module-sdk_framework-permission-s@current",
- sdk_member_name: "framework-permission-s",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.permission",
- "test_com.android.permission",
- ],
- licenses: ["permission-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: [
- "android.permission",
- "android.app.role",
- "android.safetycenter",
- "com.android.permission",
- ],
- public: {
- jars: ["sdk_library/public/framework-permission-s-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-permission-s.srcjar"],
- current_api: "sdk_library/public/framework-permission-s.txt",
- removed_api: "sdk_library/public/framework-permission-s-removed.txt",
- annotations: "sdk_library/public/framework-permission-s_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-permission-s-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-permission-s.srcjar"],
- current_api: "sdk_library/system/framework-permission-s.txt",
- removed_api: "sdk_library/system/framework-permission-s-removed.txt",
- annotations: "sdk_library/system/framework-permission-s_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-permission-s-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-permission-s.srcjar"],
- current_api: "sdk_library/module-lib/framework-permission-s.txt",
- removed_api: "sdk_library/module-lib/framework-permission-s-removed.txt",
- annotations: "sdk_library/module-lib/framework-permission-s_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
module_java_sdk_library_import {
name: "framework-permission-s",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -250,34 +142,6 @@
},
}
-java_sdk_library_import {
- name: "permission-module-sdk_service-permission@current",
- sdk_member_name: "service-permission",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.permission",
- "test_com.android.permission",
- ],
- licenses: ["permission-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/service-permission-stubs.jar"],
- stub_srcs: ["sdk_library/public/service-permission.srcjar"],
- current_api: "sdk_library/public/service-permission.txt",
- removed_api: "sdk_library/public/service-permission-removed.txt",
- annotations: "sdk_library/public/service-permission_annotations.zip",
- sdk_version: "module_current",
- },
- system_server: {
- jars: ["sdk_library/system-server/service-permission-stubs.jar"],
- stub_srcs: ["sdk_library/system-server/service-permission.srcjar"],
- current_api: "sdk_library/system-server/service-permission.txt",
- removed_api: "sdk_library/system-server/service-permission-removed.txt",
- annotations: "sdk_library/system-server/service-permission_annotations.zip",
- sdk_version: "system_server_current",
- },
-}
-
module_java_sdk_library_import {
name: "service-permission",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -313,29 +177,12 @@
}
license {
- name: "permission-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: "permission-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
-prebuilt_systemserverclasspath_fragment {
- name: "permission-module-sdk_com.android.permission-systemserverclasspath-fragment@current",
- sdk_member_name: "com.android.permission-systemserverclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.permission"],
- licenses: ["permission-module-sdk_Android-Apache-2.0@current"],
- contents: ["permission-module-sdk_service-permission@current"],
-}
-
module_prebuilt_systemserverclasspath_fragment {
name: "com.android.permission-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -350,15 +197,3 @@
licenses: ["permission-module-sdk_Android-Apache-2.0"],
contents: ["service-permission"],
}
-
-sdk_snapshot {
- name: "permission-module-sdk@current",
- visibility: ["//visibility:public"],
- bootclasspath_fragments: ["permission-module-sdk_com.android.permission-bootclasspath-fragment@current"],
- java_sdk_libs: [
- "permission-module-sdk_framework-permission@current",
- "permission-module-sdk_framework-permission-s@current",
- "permission-module-sdk_service-permission@current",
- ],
- systemserverclasspath_fragments: ["permission-module-sdk_com.android.permission-systemserverclasspath-fragment@current"],
-}
