Add resource shrinker configuration builder
This will allow AGP to switch between legacy mode and optimized mode in R8
Additionally, for the next version, it allows usage of non precise shrinking
Bug: 287398085
Change-Id: I61c76e51934b11b01e954bab3d2c7400f9e345b8
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 7621469..79a1471 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -140,6 +140,8 @@
private SemanticVersion fakeCompilerVersion = null;
private AndroidResourceProvider androidResourceProvider = null;
private AndroidResourceConsumer androidResourceConsumer = null;
+ private ResourceShrinkerConfiguration resourceShrinkerConfiguration =
+ ResourceShrinkerConfiguration.DEFAULT_CONFIGURATION;
private final ProguardConfigurationParserOptions.Builder parserOptionsBuilder =
ProguardConfigurationParserOptions.builder().readEnvironment();
@@ -539,6 +541,19 @@
return this;
}
+ /**
+ * API for configuring resource shrinking.
+ *
+ * <p>Set the configuration properties on the provided builder.
+ */
+ public Builder setResourceShrinkerConfiguration(
+ Function<ResourceShrinkerConfiguration.Builder, ResourceShrinkerConfiguration>
+ configurationBuilder) {
+ this.resourceShrinkerConfiguration =
+ configurationBuilder.apply(ResourceShrinkerConfiguration.builder(getReporter()));
+ return this;
+ }
+
@Override
void validate() {
if (isPrintHelp()) {
diff --git a/src/main/java/com/android/tools/r8/ResourceShrinkerConfiguration.java b/src/main/java/com/android/tools/r8/ResourceShrinkerConfiguration.java
new file mode 100644
index 0000000..9995d19
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ResourceShrinkerConfiguration.java
@@ -0,0 +1,95 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+package com.android.tools.r8;
+
+import com.android.tools.r8.keepanno.annotations.KeepForApi;
+
+/**
+ * Resource shrinker configuration. Allows building an immutable structure of resource shrinker
+ * settings.
+ *
+ * <p>A {@link ResourceShrinkerConfiguration} can be added to a {@link R8Command} change the way
+ * resource shrinking is performed.
+ *
+ * <p>To build a {@link ResourceShrinkerConfiguration} use the {@link
+ * ResourceShrinkerConfiguration.Builder} class, available through the {@link R8Command.Builder}.
+ * For example:
+ *
+ * <pre>
+ * R8Command command = R8Command.builder()
+ * .addProgramFiles(path1, path2)
+ * .setMode(CompilationMode.RELEASE)
+ * .setProgramConsumer(programConsumer)
+ * .setResourceShrinkerConfiguration(builder -> builder
+ * .enableOptimizedShrinkingWithR8()
+ * .build())
+ * .build();
+ * </pre>
+ */
+@KeepForApi
+public class ResourceShrinkerConfiguration {
+ static ResourceShrinkerConfiguration DEFAULT_CONFIGURATION =
+ new ResourceShrinkerConfiguration(false, true);
+
+ private final boolean optimizedShrinking;
+ private final boolean preciseShrinking;
+
+ private ResourceShrinkerConfiguration(boolean optimizedShrinking, boolean preciseShrinking) {
+ this.optimizedShrinking = optimizedShrinking;
+ this.preciseShrinking = preciseShrinking;
+ }
+
+ static Builder builder(DiagnosticsHandler handler) {
+ return new Builder();
+ }
+
+ /**
+ * Builder for constructing a ResourceShrinkerConfiguration.
+ *
+ * <p>A builder is obtained by calling setResourceShrinkerConfiguration on a {@link
+ * R8Command.Builder}.
+ */
+ @KeepForApi
+ public static class Builder {
+
+ private boolean optimizedShrinking = false;
+ private boolean preciseShrinking = true;
+
+ private Builder() {}
+
+ /**
+ * Enable R8 based resource shrinking.
+ *
+ * <p>If this is not set, r8 will use resource shrinking legacy mode where resource shrinking is
+ * done after code has been generated. This is consistent with a setup where resource shrinking
+ * is run seperately from R8.
+ *
+ * <p>Setting this option allows R8 to shrink resources as part of its normal compilation,
+ * tracing resources throughout the pipeline.
+ */
+ public Builder enableOptimizedShrinkingWithR8() {
+ assert preciseShrinking;
+ this.optimizedShrinking = true;
+ return this;
+ }
+
+ /**
+ * Disable precise shrinking.
+ *
+ * <p>The resource table will not be rewritten. Unused entries in the res folder will be
+ * replaced by small dummy files.
+ */
+ @Deprecated
+ public Builder disablePreciseShrinking() {
+ assert !optimizedShrinking;
+ this.preciseShrinking = false;
+ return this;
+ }
+
+ /** Build and return the {@link ResourceShrinkerConfiguration} */
+ public ResourceShrinkerConfiguration build() {
+ return new ResourceShrinkerConfiguration(optimizedShrinking, preciseShrinking);
+ }
+ }
+}
