Merge "Use 10 jarjar shards unconditionally" into main am: 821abb8afd am: 1c01564597

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

Change-Id: I1a41824f2ce6fb059db94e9796dcad4722caa761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 9d8c8a69fc18..9d3b64d7335b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -529,11 +529,7 @@ java_library {
         ],
     },
     jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",
-
-    jarjar_shards: select(release_flag("RELEASE_USE_SHARDED_JARJAR_ON_FRAMEWORK_MINUS_APEX"), {
-        true: "10",
-        default: "1",
-    }),
+    jarjar_shards: "10",
 }
 
 java_library {