Merge SP1A.211205.008
Bug: 205056467
Merged-In: I177790a10ff9330fc3e62f6e98b558e4b6b6bb3b
Change-Id: I31c142c10173009945f7bf8e6ae7767f71270667
diff --git a/current/Android.bp b/current/Android.bp
index 02e8368..cc238dc 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -32,7 +32,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.scheduling-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -64,6 +64,7 @@
stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
current_api: "sdk_library/public/framework-scheduling.txt",
removed_api: "sdk_library/public/framework-scheduling-removed.txt",
+ annotations: "sdk_library/public/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -71,6 +72,7 @@
stub_srcs: ["sdk_library/system/framework-scheduling.srcjar"],
current_api: "sdk_library/system/framework-scheduling.txt",
removed_api: "sdk_library/system/framework-scheduling-removed.txt",
+ annotations: "sdk_library/system/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -78,13 +80,14 @@
stub_srcs: ["sdk_library/module-lib/framework-scheduling.srcjar"],
current_api: "sdk_library/module-lib/framework-scheduling.txt",
removed_api: "sdk_library/module-lib/framework-scheduling-removed.txt",
+ annotations: "sdk_library/module-lib/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-scheduling",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -100,6 +103,7 @@
stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
current_api: "sdk_library/public/framework-scheduling.txt",
removed_api: "sdk_library/public/framework-scheduling-removed.txt",
+ annotations: "sdk_library/public/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -107,6 +111,7 @@
stub_srcs: ["sdk_library/system/framework-scheduling.srcjar"],
current_api: "sdk_library/system/framework-scheduling.txt",
removed_api: "sdk_library/system/framework-scheduling-removed.txt",
+ annotations: "sdk_library/system/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -114,6 +119,7 @@
stub_srcs: ["sdk_library/module-lib/framework-scheduling.srcjar"],
current_api: "sdk_library/module-lib/framework-scheduling.txt",
removed_api: "sdk_library/module-lib/framework-scheduling-removed.txt",
+ annotations: "sdk_library/module-lib/framework-scheduling_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/framework-scheduling_annotations.zip b/current/sdk_library/module-lib/framework-scheduling_annotations.zip
new file mode 100644
index 0000000..ff6b9b8
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-scheduling_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-scheduling_annotations.zip b/current/sdk_library/public/framework-scheduling_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-scheduling_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-scheduling_annotations.zip b/current/sdk_library/system/framework-scheduling_annotations.zip
new file mode 100644
index 0000000..ff6b9b8
--- /dev/null
+++ b/current/sdk_library/system/framework-scheduling_annotations.zip
Binary files differ
