DO NOT MERGE: Drop prebuilt files to android source tree.
The following files have been updated as part of this change:
current/Android.bp
current/snapshot-creation-build-number.txt
current/licenses/build/soong/licenses/LICENSE
current/java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar
current/sdk_library/module-lib/framework-scheduling-removed.txt
current/sdk_library/module-lib/framework-scheduling-stubs.jar
current/sdk_library/module-lib/framework-scheduling.srcjar
current/sdk_library/module-lib/framework-scheduling.txt
current/sdk_library/module-lib/framework-scheduling_annotations.zip
current/sdk_library/public/framework-scheduling-removed.txt
current/sdk_library/public/framework-scheduling-stubs.jar
current/sdk_library/public/framework-scheduling.srcjar
current/sdk_library/public/framework-scheduling.txt
current/sdk_library/public/framework-scheduling_annotations.zip
current/sdk_library/system/framework-scheduling-removed.txt
current/sdk_library/system/framework-scheduling-stubs.jar
current/sdk_library/system/framework-scheduling.srcjar
current/sdk_library/system/framework-scheduling.txt
current/sdk_library/system/framework-scheduling_annotations.zip
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
Built here: ab/T1007089
This build IS suitable for public release.
The change is generated with prebuilt drop tool.
Test: presubmit
Bug: 285888783
Change-Id: I0a0573d3809d9a88a498c0168372b5ba4774917c
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 12f2cff..20ec757 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1005166"
+ build_id: "T1007089"
target: "train_build"
- source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
+ source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Scheduling"
- git_branch: "tm-qpr-dev"
+ git_branch: "udc-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/Android.bp b/current/Android.bp
index 77be3f7..ee0ae00 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,14 +1,9 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_import",
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- "module_prebuilt_systemserverclasspath_fragment",
- ],
+// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
+// to support coexistence.
+blueprint_package_includes {
+ match_all: ["com.android.mainline"]
}
package {
@@ -17,14 +12,12 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.scheduling-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
@@ -46,14 +39,12 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "framework-scheduling",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
@@ -86,19 +77,18 @@
},
}
-module_java_import {
+java_import {
name: "service-scheduling",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar"],
+ min_sdk_version: "31",
}
license {
@@ -108,14 +98,12 @@
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
-module_prebuilt_systemserverclasspath_fragment {
+prebuilt_systemserverclasspath_fragment {
name: "com.android.scheduling-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "ANDROID",
+ var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
diff --git a/current/sdk_library/module-lib/framework-scheduling-stubs.jar b/current/sdk_library/module-lib/framework-scheduling-stubs.jar
index bdfe940..aa52704 100644
--- a/current/sdk_library/module-lib/framework-scheduling-stubs.jar
+++ b/current/sdk_library/module-lib/framework-scheduling-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-scheduling.srcjar b/current/sdk_library/module-lib/framework-scheduling.srcjar
index 7462a35..0552c56 100644
--- a/current/sdk_library/module-lib/framework-scheduling.srcjar
+++ b/current/sdk_library/module-lib/framework-scheduling.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-scheduling-stubs.jar b/current/sdk_library/system/framework-scheduling-stubs.jar
index 1003a2b..10947b2 100644
--- a/current/sdk_library/system/framework-scheduling-stubs.jar
+++ b/current/sdk_library/system/framework-scheduling-stubs.jar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6382e10..42ea358 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9147603
\ No newline at end of file
+10351819
\ No newline at end of file
