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

Commit 57b1cafc authored by LaMont Jones's avatar LaMont Jones Committed by Automerger Merge Worker
Browse files

Merge "services.core: use services.core.combined" into main am: 2b12449f am: a22e73f8 

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



Change-Id: I0136ab3432fa7568da46ab8aa5cbe421dc2600e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a190f5ad a22e73f8

services/core/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -300,10 +300,7 @@ java_genrule_combiner { 


java_library {

    name: "services.core",

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

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

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

    }),

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

}



java_library_host {