Snap for 8189365 from 9e687daee83996381d250aa549178e20e87444bc to tm-frc-scheduling-release
Change-Id: Ibdfad96a42b7d825411adfb6c4086690a6a18240
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index ab66575..c84c9b9 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: "7542407"
+ build_id: "7611331"
target: "mainline_modules-user"
source_file: "mainline-sdks/scheduling-sdk-current.zip"
}
@@ -10,4 +10,10 @@
git_project: "platform/prebuilts/module_sdk/Scheduling"
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 b/current/Android.bp
index 2338ce2..0e25c95 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- ],
-}
-
prebuilt_bootclasspath_fragment {
name: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
@@ -30,14 +22,9 @@
},
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.scheduling-bootclasspath-fragment",
prefer: false,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
@@ -58,12 +45,12 @@
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
shared_library: false,
+ permitted_packages: ["android.scheduling"],
public: {
jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
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,7 +58,6 @@
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: {
@@ -79,29 +65,23 @@
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 {
+java_sdk_library_import {
name: "framework-scheduling",
prefer: false,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
shared_library: false,
+ permitted_packages: ["android.scheduling"],
public: {
jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
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: {
@@ -109,7 +89,6 @@
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: {
@@ -117,7 +96,6 @@
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/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..0e25c95
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,123 @@
+// 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: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
+ sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
+ contents: ["scheduling-sdk_framework-scheduling@current"],
+ hidden_api: {
+ 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.scheduling-bootclasspath-fragment",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0"],
+ contents: ["framework-scheduling"],
+ hidden_api: {
+ 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: "scheduling-sdk_framework-scheduling@current",
+ sdk_member_name: "framework-scheduling",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
+ shared_library: false,
+ permitted_packages: ["android.scheduling"],
+ public: {
+ jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "framework-scheduling",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0"],
+ shared_library: false,
+ permitted_packages: ["android.scheduling"],
+ public: {
+ jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-scheduling-stubs.jar"],
+ 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",
+ sdk_version: "module_current",
+ },
+}
+
+license {
+ name: "scheduling-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: "scheduling-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: "scheduling-sdk@current",
+ visibility: ["//visibility:public"],
+ bootclasspath_fragments: ["scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current"],
+ java_sdk_libs: ["scheduling-sdk_framework-scheduling@current"],
+}
diff --git a/current/sdk_library/module-lib/framework-scheduling_annotations.zip b/current/sdk_library/module-lib/framework-scheduling_annotations.zip
deleted file mode 100644
index ff6b9b8..0000000
--- a/current/sdk_library/module-lib/framework-scheduling_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/current/sdk_library/public/framework-scheduling_annotations.zip b/current/sdk_library/public/framework-scheduling_annotations.zip
deleted file mode 100644
index 15cb0ec..0000000
--- a/current/sdk_library/public/framework-scheduling_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/current/sdk_library/system/framework-scheduling_annotations.zip b/current/sdk_library/system/framework-scheduling_annotations.zip
deleted file mode 100644
index ff6b9b8..0000000
--- a/current/sdk_library/system/framework-scheduling_annotations.zip
+++ /dev/null
Binary files differ
