diff options
| author | 2025-02-07 14:12:31 -0800 | |
|---|---|---|
| committer | 2025-02-07 14:12:31 -0800 | |
| commit | 5128035f9990254fc055140abb0865e1a48c77cc (patch) | |
| tree | 5091840a6c98333d58680db12364105026e22723 | |
| parent | 10672afdaf77ad03db7fc40740504db7e13011b2 (diff) | |
| parent | 354751cff50e643f946991789e74154d40160789 (diff) | |
Merge "services.core: use java_genrule_combiner" into main am: b1731ceade am: 354751cff5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3481737
Change-Id: I6328a541e0accd8af1b626fff857c8ccb172fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/Android.bp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index f98076ab41e4..00db11e72dd9 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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 { |