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

Commit 5128035f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "services.core: use java_genrule_combiner" into main am: b1731cea am: 354751cf 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3481737



Change-Id: I6328a541e0accd8af1b626fff857c8ccb172fe01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10672afd 354751cf

services/core/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -292,9 +292,18 @@ java_genrule { 
    out: ["services.core.priorityboosted.jar"],

}



java_genrule_combiner {

    name: "services.core.combined",

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

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

}



java_library {

    name: "services.core",

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

    static_libs: select(release_flag("RELEASE_SERVICES_JAVA_GENRULE_COMBINER"), {

        true: ["services.core.combined"],

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

    }),

}



java_library_host {