From 03c19ddcd2404c4bdd20b2e83d5c6f6d56f38d46 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Mon, 3 Feb 2025 06:06:25 -0800 Subject: services.core: use java_genrule_combiner Bug: b/285975842 Test: manual, TH Ignore-AOSP-First: modules not present in aosp Change-Id: Ibd52dffaaef84006733f0b194fb212f404b82178 --- services/core/Android.bp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/services/core/Android.bp b/services/core/Android.bp index 47c600e398c3..22763f1cf729 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -275,9 +275,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 { -- cgit v1.2.3-59-g8ed1b