Automatic code cleanup.
PiperOrigin-RevId: 425873532
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
index e759703..6462a57 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
@@ -310,7 +310,7 @@
for (Map.Entry<String, NestedSet<Artifact>> entry : getNativeLibs().entrySet()) {
builder.put(entry.getKey(), Depset.of(Artifact.TYPE, entry.getValue()));
}
- return builder.build();
+ return builder.buildOrThrow();
}
/** Provider class for {@link AndroidIdeInfoProvider} objects. */
@@ -360,7 +360,7 @@
ImmutableList.copyOf(
Sequence.cast(idlGeneratedJavaFiles, Artifact.class, "idl_generated_java_files")),
ImmutableList.copyOf(Sequence.cast(apksUnderTest, Artifact.class, "apks_under_test")),
- builder.build(),
+ builder.buildOrThrow(),
fromNoneable(resourceApk, Artifact.class));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
index 1dac6d4..edce7ae 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
@@ -272,7 +272,7 @@
Artifact output = ruleContext.getGenfilesArtifact(javaOutputPath.getPathString());
outputJavaSources.put(idl, output);
}
- return outputJavaSources.build();
+ return outputJavaSources.buildOrThrow();
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
index 2a3ce87..df9d95b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java
@@ -285,11 +285,12 @@
}
switch (manifestMergerOrder) {
case ALPHABETICAL:
- return ImmutableSortedMap.copyOf(builder.build(), Artifact.EXEC_PATH_COMPARATOR);
+ return ImmutableSortedMap.copyOf(builder.buildOrThrow(), Artifact.EXEC_PATH_COMPARATOR);
case ALPHABETICAL_BY_CONFIGURATION:
- return ImmutableSortedMap.copyOf(builder.build(), Artifact.ROOT_RELATIVE_PATH_COMPARATOR);
+ return ImmutableSortedMap.copyOf(
+ builder.buildOrThrow(), Artifact.ROOT_RELATIVE_PATH_COMPARATOR);
case DEPENDENCY:
- return builder.build();
+ return builder.buildOrThrow();
}
throw new AssertionError(manifestMergerOrder);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuntimeJarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuntimeJarProvider.java
index c38a56f..63dd247 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuntimeJarProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuntimeJarProvider.java
@@ -64,7 +64,8 @@
/** Returns the finished {@link AndroidRuntimeJarProvider}. */
public AndroidRuntimeJarProvider build() {
- return new AndroidRuntimeJarProvider(transitiveMappings.add(newlyDesugared.build()).build());
+ return new AndroidRuntimeJarProvider(
+ transitiveMappings.add(newlyDesugared.buildOrThrow()).build());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSplitTransition.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSplitTransition.java
index 15e6931..67e83ed 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSplitTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSplitTransition.java
@@ -146,7 +146,7 @@
addNonCpuSplits(result, platform.getName(), splitOptions);
}
- return result.build();
+ return result.buildOrThrow();
}
/** Returns a single-split transition that uses the "--cpu" and does not change any flags. */
@@ -156,7 +156,7 @@
ImmutableMap.Builder<String, BuildOptions> result = ImmutableMap.builder();
result.put(cpu, buildOptions.underlying());
addNonCpuSplits(result, cpu, buildOptions);
- return result.build();
+ return result.buildOrThrow();
}
/**
@@ -196,7 +196,7 @@
result.put(cpu, splitOptions.underlying());
addNonCpuSplits(result, cpu, splitOptions);
}
- return result.build();
+ return result.buildOrThrow();
}
private void setCcFlagsFromAndroid(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
index 73629e8..0a1e76b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
@@ -352,7 +352,7 @@
spawnActionBuilder.addCommandLine(commandLine.build(), FORCED_PARAM_FILE_INFO);
}
- spawnActionBuilder.setExecutionInfo(executionInfo.build());
+ spawnActionBuilder.setExecutionInfo(executionInfo.buildOrThrow());
dataContext.registerAction(spawnActionBuilder);
}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index e8e489e..1c42149 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -54,7 +54,7 @@
public Map<String, String> convert(String input) {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
if (input.isEmpty()) {
- return builder.build();
+ return builder.buildOrThrow();
}
String[] elements = input.split(":");
@@ -66,7 +66,7 @@
}
builder.put(unescape(name), unescape(value));
}
- return builder.build();
+ return builder.buildOrThrow();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamer.java b/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamer.java
index b41ba96..26c6b43 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamer.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamer.java
@@ -370,14 +370,14 @@
for (BuildEventTransport transport : transports) {
closeFuturesMapBuilder.put(transport, transport.close());
}
- closeFuturesMap = closeFuturesMapBuilder.build();
+ closeFuturesMap = closeFuturesMapBuilder.buildOrThrow();
ImmutableMap.Builder<BuildEventTransport, ListenableFuture<Void>> halfCloseFuturesMapBuilder =
ImmutableMap.builder();
for (BuildEventTransport transport : transports) {
halfCloseFuturesMapBuilder.put(transport, transport.getHalfCloseFuture());
}
- halfCloseFuturesMap = halfCloseFuturesMapBuilder.build();
+ halfCloseFuturesMap = halfCloseFuturesMapBuilder.buildOrThrow();
}
private void maybeReportArtifactSet(CompletionContext ctx, NestedSet<?> set) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/GCStatsRecorder.java b/src/main/java/com/google/devtools/build/lib/runtime/GCStatsRecorder.java
index f073b93..e4ea71a 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/GCStatsRecorder.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/GCStatsRecorder.java
@@ -35,7 +35,7 @@
initialData.put(name, new GCStat(name, mxBean.getCollectionCount(),
mxBean.getCollectionTime()));
}
- this.initialData = initialData.build();
+ this.initialData = initialData.buildOrThrow();
}
public Iterable<GCStat> getCurrentGcStats() {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java b/src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java
index 6dc5ff2..b7982f8 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java
@@ -60,7 +60,7 @@
}
ImmutableMap<String, InfoItem> getInfoItems() {
- return infoItems.build();
+ return infoItems.buildOrThrow();
}
ImmutableList<QueryFunction> getQueryFunctions() {
@@ -196,6 +196,6 @@
/** Returns a map of all registered {@link AuthHeadersProvider}s. */
public ImmutableMap<String, AuthHeadersProvider> getAuthHeadersProvidersMap() {
- return authHeadersProvidersMap.build();
+ return authHeadersProvidersMap.buildOrThrow();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java b/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java
index e24a12b..b93a1a5 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java
@@ -94,7 +94,7 @@
result.put(e.getElement(), e.getCount());
}
- return result.build();
+ return result.buildOrThrow();
}
public static String convertSummaryToString(ImmutableMap<String, Integer> spawnSummary) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
index a49603d..84a732a 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
@@ -78,7 +78,7 @@
runtime.getActionKeyContext(),
workspaceStatusActionFactory,
diffAwarenessFactories.build(),
- skyFunctions.build(),
+ skyFunctions.buildOrThrow(),
skyframeExecutorRepositoryHelpersHolder,
skyKeyStateReceiver == null
? SkyframeExecutor.SkyKeyStateReceiver.NULL_INSTANCE
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunctionTest.java
index a5699c5..6f8082d 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunctionTest.java
@@ -78,7 +78,7 @@
.setVersion(Version.parse("1.0"))
.setKey(createModuleKey("rules_java", ""))
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"dep",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleFunctionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleFunctionTest.java
index e6c797d..f8cf52b 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleFunctionTest.java
@@ -283,7 +283,7 @@
ImmutableList.of(
"https://maven.google.com", "https://repo1.maven.org/maven2")))
.build());
- return new FakeBzlmodRepoRuleHelper(repoSpecs.build());
+ return new FakeBzlmodRepoRuleHelper(repoSpecs.buildOrThrow());
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleHelperTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleHelperTest.java
index b3ca48a..91f4971 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodRepoRuleHelperTest.java
@@ -121,7 +121,7 @@
GET_REPO_SPEC_BY_NAME_FUNCTION,
new GetRepoSpecByNameFunction(new BzlmodRepoRuleHelperImpl()))
.put(SkyFunctions.PRECOMPUTED, new PrecomputedFunction())
- .build(),
+ .buildOrThrow(),
differencer);
PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodTestUtil.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodTestUtil.java
index f90f581..ee7eea8 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodTestUtil.java
@@ -43,7 +43,7 @@
RepositoryName.createFromValidStrippedName(names[i]),
RepositoryName.createFromValidStrippedName(names[i + 1]));
}
- return RepositoryMapping.create(mappingBuilder.build(), key.getCanonicalRepoName());
+ return RepositoryMapping.create(mappingBuilder.buildOrThrow(), key.getCanonicalRepoName());
}
public static TagClass createTagClass(Attribute... attrs) {
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
index 5b4cecd..6222f98 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
@@ -183,7 +183,7 @@
ruleClassProvider,
directories,
new BzlmodRepoRuleHelperImpl()))
- .build(),
+ .buildOrThrow(),
differencer);
PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
index d9cff8e..27b35c7 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
@@ -153,7 +153,7 @@
ruleClassProvider,
directories,
new BzlmodRepoRuleHelperImpl()))
- .build(),
+ .buildOrThrow(),
differencer);
PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java
index f913275..e450119 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java
@@ -74,7 +74,7 @@
.setKey(createModuleKey("D", "2.0"))
.setCompatibilityLevel(1)
.build())
- .build();
+ .buildOrThrow();
assertThat(Selection.run(depGraph, /*overrides=*/ ImmutableMap.of()))
.containsExactly(
@@ -241,7 +241,7 @@
.setVersion(Version.parse("1.0"))
.setKey(createModuleKey("D", "1.0"))
.build())
- .build();
+ .buildOrThrow();
assertThat(Selection.run(depGraph, /*overrides=*/ ImmutableMap.of()))
.containsExactly(
@@ -315,7 +315,7 @@
.setKey(createModuleKey("D", "2.0"))
.setCompatibilityLevel(2)
.build())
- .build();
+ .buildOrThrow();
ExternalDepsException e =
assertThrows(
@@ -401,7 +401,7 @@
.setKey(createModuleKey("C", "1.1"))
.setCompatibilityLevel(1)
.build())
- .build();
+ .buildOrThrow();
// After selection, C 2.0 is gone, so we're okay.
// A 1.0 -> B 1.1
@@ -477,7 +477,7 @@
.setVersion(Version.parse("2.0"))
.setKey(createModuleKey("B", "2.0"))
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"B",
@@ -522,7 +522,7 @@
.setVersion(Version.parse("2.0"))
.setKey(createModuleKey("B", "2.0"))
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"B",
@@ -589,7 +589,7 @@
.setVersion(Version.parse("1.5"))
.setKey(createModuleKey("B", "1.5"))
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"B",
@@ -649,7 +649,7 @@
.setKey(createModuleKey("D", "2.0"))
.setCompatibilityLevel(2)
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"D",
@@ -740,7 +740,7 @@
.setVersion(Version.parse("2.0"))
.setKey(createModuleKey("D", "2.0"))
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"D",
@@ -887,7 +887,7 @@
.setKey(createModuleKey("C", "2.0"))
.setCompatibilityLevel(2)
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"C",
@@ -1037,7 +1037,7 @@
.setKey(createModuleKey("C", "2.0"))
.setCompatibilityLevel(2)
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"C",
@@ -1118,7 +1118,7 @@
.setKey(createModuleKey("C", "3.0"))
.setCompatibilityLevel(3)
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"C",
@@ -1235,7 +1235,7 @@
.setKey(createModuleKey("C", "3.0"))
.setCompatibilityLevel(3)
.build())
- .build();
+ .buildOrThrow();
ImmutableMap<String, ModuleOverride> overrides =
ImmutableMap.of(
"C",
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
index 7dbaa02..2bffef2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
@@ -182,7 +182,7 @@
.put(UiModeType.UI_MODE_TYPE_TELEVISION, UiMode.TELEVISION)
.put(UiModeType.UI_MODE_TYPE_VRHEADSET, UiMode.NORMAL)
.put(UiModeType.UI_MODE_TYPE_WATCH, UiMode.WATCH)
- .build();
+ .buildOrThrow();
private static final ImmutableMap<Configuration.UiModeNight, NightMode> NIGHT_MODE_MAP =
ImmutableMap.of(
@@ -245,7 +245,7 @@
.put(320, Density.XHIGH)
.put(480, Density.XXHIGH)
.put(640, Density.XXXHIGH)
- .build();
+ .buildOrThrow();
private final boolean includeFileContentsForValidation;
diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
index 431169d..34db7f1 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
@@ -137,7 +137,7 @@
.put("xxhdpi", 480)
.put("560dpi", 560)
.put("xxxhdpi", 640)
- .build();
+ .buildOrThrow();
private static final Function<ResourceInfo, String> GET_RESOURCE_ID =
new Function<ResourceInfo, String>() {
diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
index 4d91397..3d7d273 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
@@ -214,7 +214,7 @@
mergedManifest =
manifestProcessor.mergeManifest(
manifest,
- mergeeManifests.build(),
+ mergeeManifests.buildOrThrow(),
options.mergeType,
options.manifestValues,
options.customPackage,
diff --git a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
index 5bf8bd0..3637375 100644
--- a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
@@ -346,7 +346,7 @@
// The styleable array should be sorted by ID value.
// Make sure that if we have android: framework attributes, their IDs are listed first.
ImmutableMap<String, Integer> arrayInitMap =
- arrayInitValues.orderEntriesByValue(Ordering.<Integer>natural()).build();
+ arrayInitValues.orderEntriesByValue(Ordering.<Integer>natural()).buildOrThrow();
initList.add(
IntArrayFieldInitializer.of(
dependencyInfo,
diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
index 9967577..580f039 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
@@ -112,7 +112,7 @@
}
}
return PluralXmlResourceValue.createWithAttributesAndValues(
- ImmutableMap.copyOf(parseTagAttributes(start)), values.build());
+ ImmutableMap.copyOf(parseTagAttributes(start)), values.buildOrThrow());
}
static XmlResourceValue parseStyle(XMLEventReader eventReader, StartElement start)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java b/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java
index e1c3dc6..0f75ad7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ZipFilterAction.java
@@ -246,7 +246,10 @@
}
ZipFilterEntryFilter entryFilter =
new ZipFilterEntryFilter(
- explicitFilter, entriesToOmit, inputEntries.build(), options.hashMismatchCheckMode);
+ explicitFilter,
+ entriesToOmit,
+ inputEntries.buildOrThrow(),
+ options.hashMismatchCheckMode);
try (OutputStream out = Files.newOutputStream(options.outputZip);
ZipCombiner combiner = new ZipCombiner(options.outputMode, entryFilter, out)) {
