commit 42eae92f59082fb9a0a027169280eedb8ca2f167
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 26 10:40:37 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 26 10:40:37 2022 +0000
tree e18065e6fa9e6046499f683f4445dfba3f621ccd
parent 7f6676a92f811ab4daf0ac8c60c5ada2dcc8003c
parent 6e5773dd058d2af5ef004863ae47a6938781c692

Snap for 8870366 from 6e5773dd058d2af5ef004863ae47a6938781c692 to mainline-go-art-release

Change-Id: I4942157086d62df0983793d39cb1decdf50812bc

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index d425260..dcacec9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -88,6 +88,9 @@
 
 sdk {
     name: "scheduling-sdk",
-    bootclasspath_fragments: ["com.android.scheduling-bootclasspath-fragment"],
-    systemserverclasspath_fragments: ["com.android.scheduling-systemserverclasspath-fragment"],
+    apexes: [
+        // Adds exportable dependencies of the APEX to the sdk,
+        // e.g. *classpath_fragments.
+        "com.android.scheduling",
+    ],
 }

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 34ead52..6006e8a 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -50,7 +50,10 @@
         ":reboot-stats-parser",
     ],
     min_sdk_version: "31",
-    defaults: ["framework-system-server-module-defaults" ],
+    defaults: [
+        "framework-system-server-module-defaults",
+        "standalone-system-server-module-optimize-defaults",
+    ],
     sdk_version: "system_server_current",
     libs: [
         "framework-scheduling.impl",