Merge "Make services.core the final priorityboosted jar"

services/Android.bp

@@ -14,7 +14,7 @@ java_library {
 
     // The convention is to name each service module 'services.$(module_name)'
     static_libs: [
-        "services.core.priorityboosted",
+        "services.core",
         "services.accessibility",
         "services.appwidget",
         "services.autofill",

services/core/Android.bp

@@ -1,5 +1,5 @@
 java_library_static {
-    name: "services.core",
+    name: "services.core.unboosted",
 
     aidl: {
         include_dirs: [
@@ -38,7 +38,7 @@ java_library_static {
 
 java_genrule {
     name: "services.core.priorityboosted",
-    srcs: [":services.core"],
+    srcs: [":services.core.unboosted"],
     tools: ["lockedregioncodeinjection"],
     cmd: "$(location lockedregioncodeinjection) " +
         "  --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " +
@@ -48,3 +48,8 @@ java_genrule {
         "  -i $(in)",
     out: ["services.core.priorityboosted.jar"],
 }
+
+java_library {
+    name: "services.core",
+    static_libs: ["services.core.priorityboosted"],
+}