summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author LaMont Jones <lamontjones@google.com> 2025-02-03 06:06:25 -0800
committer LaMont Jones <lamontjones@google.com> 2025-02-07 11:45:38 -0800
commit03c19ddcd2404c4bdd20b2e83d5c6f6d56f38d46 (patch)
treef90166b2ff171f69db31bb80d062b766dbf8fb12
parent553a81ed5f5f5e62cfd84d722c3f1eb2e5c418c2 (diff)
services.core: use java_genrule_combiner
Bug: b/285975842 Test: manual, TH Ignore-AOSP-First: modules not present in aosp Change-Id: Ibd52dffaaef84006733f0b194fb212f404b82178
-rw-r--r--services/core/Android.bp11
1 files changed, 10 insertions, 1 deletions
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 {