[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: 20e94f106f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Scheduling/+/15358643
Change-Id: Iec87498d19233dc5aa3c8b25246ae60e90ad38ed
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index b14c864..ab66575 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: "7570495"
+ build_id: "7542407"
target: "mainline_modules-user"
source_file: "mainline-sdks/scheduling-sdk-current.zip"
}
@@ -10,10 +10,4 @@
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 3f01a09..fc99b11 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: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
@@ -81,14 +68,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "framework-scheduling",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
deleted file mode 100644
index 0e25c95..0000000
--- a/current/Android.bp.auto
+++ /dev/null
@@ -1,123 +0,0 @@
-// 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"],
-}