Add support for annotations in module_sdk
Support has been added to SDKs for annotations, update the
prebuilts to contain annotations as well.
- The Android.bp changes in this change were made manually
- The annotation zip files are from build 7815890
Bug: 187397779
Test: m nothing
Merged-In: I43c581b2e9ea956b787927ff63303fada43e317f
Change-Id: I43c581b2e9ea956b787927ff63303fada43e317f
diff --git a/current/Android.bp b/current/Android.bp
index e4e05e6..3fb123c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -63,6 +63,7 @@
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: {
@@ -70,6 +71,7 @@
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: {
@@ -77,6 +79,7 @@
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",
},
}
@@ -100,6 +103,7 @@
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: {
@@ -107,6 +111,7 @@
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: {
@@ -114,6 +119,7 @@
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",
},
}
@@ -138,6 +144,7 @@
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: {
@@ -145,6 +152,7 @@
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: {
@@ -152,6 +160,7 @@
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",
},
}
@@ -176,6 +185,7 @@
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: {
@@ -183,6 +193,7 @@
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: {
@@ -190,6 +201,7 @@
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",
},
}
@@ -209,6 +221,7 @@
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: {
@@ -216,6 +229,7 @@
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",
},
}
@@ -235,6 +249,7 @@
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: {
@@ -242,6 +257,7 @@
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",
},
}
diff --git a/current/sdk_library/module-lib/framework-permission-s_annotations.zip b/current/sdk_library/module-lib/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..67539e6
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-permission_annotations.zip b/current/sdk_library/module-lib/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-permission-s_annotations.zip b/current/sdk_library/public/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-permission_annotations.zip b/current/sdk_library/public/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/service-permission_annotations.zip b/current/sdk_library/public/service-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/service-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system-server/service-permission_annotations.zip b/current/sdk_library/system-server/service-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/system-server/service-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-permission-s_annotations.zip b/current/sdk_library/system/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..0de31d8
--- /dev/null
+++ b/current/sdk_library/system/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-permission_annotations.zip b/current/sdk_library/system/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/system/framework-permission_annotations.zip
Binary files differ
