commit 9e8808b190e95bd2df9237fd293463e1816c8f6e
author android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> Thu Jul 15 14:56:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 15 14:56:23 2021 +0000
tree d204413ca00b78221b447b6a423b5e0650f3686c
parent 972020de4bb7e21fd3fc5df7616ac738941b1bfd
parent 46ac5828216e87111cd8c3d55e80f2ca2224f33f

[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: 46ac582821 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Scheduling/+/15299500

Change-Id: Ieacf343c746574e8cce688b08bc29f64254d0c78

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 53aadbc..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: "7548924"
+    build_id: "7542407"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/scheduling-sdk-current.zip"
   }
@@ -10,7 +10,4 @@
   git_project: "platform/prebuilts/module_sdk/Scheduling"
   git_branch: "sc-dev"
   transform: TRANSFORM_UNZIP
-  transform_options {
-    exclude: "Android.bp"
-  }
 }

current/Android.bp

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"],