Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c0b06b7 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 9a3132d0

services/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ java_library { 




    // The convention is to name each service module 'services.$(module_name)'

    // The convention is to name each service module 'services.$(module_name)'

    static_libs: [

    static_libs: [

        "services.core.priorityboosted",

        "services.core",

        "services.accessibility",

        "services.accessibility",

        "services.appwidget",

        "services.appwidget",

        "services.autofill",

        "services.autofill",

services/core/Android.bp

+7 −2
Original line number Original line Diff line number Diff line 
java_library_static {

java_library_static {

    name: "services.core",

    name: "services.core.unboosted",





    aidl: {

    aidl: {

        include_dirs: [

        include_dirs: [
@@ -38,7 +38,7 @@ java_library_static { 




java_genrule {

java_genrule {

    name: "services.core.priorityboosted",

    name: "services.core.priorityboosted",

    srcs: [":services.core"],

    srcs: [":services.core.unboosted"],

    tools: ["lockedregioncodeinjection"],

    tools: ["lockedregioncodeinjection"],

    cmd: "$(location lockedregioncodeinjection) " +

    cmd: "$(location lockedregioncodeinjection) " +

        "  --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " +

        "  --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " +
@@ -48,3 +48,8 @@ java_genrule { 
        "  -i $(in)",

        "  -i $(in)",

    out: ["services.core.priorityboosted.jar"],

    out: ["services.core.priorityboosted.jar"],

}

}



java_library {

    name: "services.core",

    static_libs: ["services.core.priorityboosted"],

}