Make services.core the final priorityboosted jar

Other module besides services depend on services.core, and after
I417409281c928ea667d937090d2a0d9d72a449a2 they were getting
the non-priorityboosted version of the jar.  Make services.core
a java_library that contains the output of the priorityboosting
java_genrule.

Test: m services
Change-Id: Ic9ca1b8f43f87b0d7d36b53bbc5136a331490c3e

diff --git a/services/Android.bp b/services/Android.bp
index 5e75c37..d125adc 100644 (file)
--- a/services/Android.bp
+++ b/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",

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 8336b55..8a761af 100644 (file)
--- a/services/core/Android.bp
+++ b/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"],
+}