From 602a98cbebeff2ba1c2d8605a9552b2c8f5622ae Mon Sep 17 00:00:00 2001 From: Alex Humesky Date: Tue, 7 Feb 2017 20:44:52 +0000 Subject: Rollback of commit d11d510c571b10787856395709f9ad945ca70bb2. *** Reason for rollback *** -- PiperOrigin-RevId: 146820790 MOS_MIGRATED_REVID=146820790 --- .../rules/android/AndroidResourceParsingActionBuilder.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java index 4a926fd8e4..0d86acf744 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java @@ -112,16 +112,11 @@ public class AndroidResourceParsingActionBuilder { public ResourceContainer build(ActionConstructionContext context) { CustomCommandLine.Builder builder = new CustomCommandLine.Builder(); - - // Set the busybox tool. - builder.add("--tool").add("PARSE").add("--"); NestedSetBuilder inputs = NestedSetBuilder.naiveLinkOrder(); - inputs.addAll( - ruleContext - .getExecutablePrerequisite("$android_resources_busybox", Mode.HOST) - .getRunfilesSupport() - .getRunfilesArtifactsWithoutMiddlemen()); + inputs.addAll(ruleContext.getExecutablePrerequisite("$android_resource_parser", Mode.HOST) + .getRunfilesSupport() + .getRunfilesArtifactsWithoutMiddlemen()); Preconditions.checkNotNull(primary); builder.add("--primaryData").add(RESOURCE_CONTAINER_TO_ARG.apply(primary)); @@ -141,7 +136,7 @@ public class AndroidResourceParsingActionBuilder { .addOutputs(ImmutableList.copyOf(outs)) .setCommandLine(builder.build()) .setExecutable( - ruleContext.getExecutablePrerequisite("$android_resources_busybox", Mode.HOST)) + ruleContext.getExecutablePrerequisite("$android_resource_parser", Mode.HOST)) .setProgressMessage("Parsing Android resources for " + ruleContext.getLabel()) .setMnemonic("AndroidResourceParser") .build(context)); -- cgit v1.2.3