aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-09-26 20:34:50 -0400
committerGravatar John Cater <jcater@google.com>2017-09-27 10:01:29 -0400
commit78f41da4a69e3a81ea22365ed8a8ca8f0836bb46 (patch)
tree36875b8a05e370eb0b953d68e88646764266a54a /src/main
parent608910ecb9381737395f455d0f2f2abd5b4588a6 (diff)
remove unused code for unused aapt flags
RELNOTES: None PiperOrigin-RevId: 170136145
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java9
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java11
2 files changed, 1 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
index 1ab58922e9..297c8d9760 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
@@ -75,7 +75,6 @@ public class AndroidResourcesProcessorBuilder {
private List<String> uncompressedExtensions = Collections.emptyList();
private Artifact apkOut;
private final AndroidSdkProvider sdk;
- private List<String> assetsToIgnore = Collections.emptyList();
private SpawnAction.Builder spawnActionBuilder;
private String customJavaPackage;
private final RuleContext ruleContext;
@@ -181,11 +180,6 @@ public class AndroidResourcesProcessorBuilder {
return this;
}
- public AndroidResourcesProcessorBuilder setAssetsToIgnore(List<String> assetsToIgnore) {
- this.assetsToIgnore = assetsToIgnore;
- return this;
- }
-
public AndroidResourcesProcessorBuilder setManifestOut(Artifact manifestOut) {
this.manifestOut = manifestOut;
return this;
@@ -467,9 +461,6 @@ public class AndroidResourcesProcessorBuilder {
if (!crunchPng) {
builder.add("--useAaptCruncher=no");
}
- if (!assetsToIgnore.isEmpty()) {
- builder.addAll("--assetsToIgnore", VectorArg.join(",").each(assetsToIgnore));
- }
if (debug) {
builder.add("--debug");
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
index aa603ef10a..806a413bbf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
@@ -48,7 +48,6 @@ public class ResourceShrinkerActionBuilder {
private final AndroidSdkProvider sdk;
private List<String> uncompressedExtensions = Collections.emptyList();
- private List<String> assetsToIgnore = Collections.emptyList();
private ResourceFilter resourceFilter;
/** @param ruleContext The RuleContext of the owning rule. */
@@ -65,11 +64,6 @@ public class ResourceShrinkerActionBuilder {
return this;
}
- public ResourceShrinkerActionBuilder setAssetsToIgnore(List<String> assetsToIgnore) {
- this.assetsToIgnore = assetsToIgnore;
- return this;
- }
-
/** @param resourceFilter The filters to apply to the resources. */
public ResourceShrinkerActionBuilder setResourceFilter(ResourceFilter resourceFilter) {
this.resourceFilter = resourceFilter;
@@ -143,7 +137,7 @@ public class ResourceShrinkerActionBuilder {
this.logOut = logOut;
return this;
}
-
+
/**
* @param androidAaptVersion The aapt version to target with this action.
*/
@@ -181,9 +175,6 @@ public class ResourceShrinkerActionBuilder {
commandLine.addAll(
"--uncompressedExtensions", VectorArg.join(",").each(uncompressedExtensions));
}
- if (!assetsToIgnore.isEmpty()) {
- commandLine.addAll("--assetsToIgnore", VectorArg.join(",").each(assetsToIgnore));
- }
if (ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT) {
commandLine.add("--debug");
}