diff options
7 files changed, 100 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index fb2ec1acbb..48a8a931cd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -204,6 +204,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), + ruleContext.attributes().get("crunch_png", Type.BOOLEAN), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), @@ -225,6 +226,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), + ruleContext.attributes().get("crunch_png", Type.BOOLEAN), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), @@ -246,6 +248,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), + ruleContext.attributes().get("crunch_png", Type.BOOLEAN), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), @@ -258,6 +261,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { return null; } } else { + if (!ruleContext.attributes().get("crunch_png", Type.BOOLEAN)) { + ruleContext.ruleError("Setting crunch_png = 0 is not supported for android_binary" + + " rules which depend on android_resources rules."); + return null; + } + // Retrieve the resources from the resources attribute on the android_binary rule // and recompile them if necessary. ApplicationManifest resourcesManifest = ApplicationManifest.fromResourcesRule(ruleContext); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java index fc297e5224..8dc3672bb2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.android; import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition.HOST; import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL; +import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; import static com.google.devtools.build.lib.syntax.Type.STRING; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; @@ -71,6 +72,11 @@ public final class AndroidBinaryOnlyRule implements RuleDefinition { A list of file extension to leave uncompressed in apk. <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ .add(attr("nocompress_extensions", STRING_LIST)) + /* <!-- #BLAZE_RULE(android_binary).ATTRIBUTE(crunch_png) --> + Do PNG crunching (or not). This is independent of nine-patch processing, which is always + done. Currently only supported for local resources (not android_resources). + <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ + .add(attr("crunch_png", BOOLEAN).value(true)) /* <!-- #BLAZE_RULE(android_binary).ATTRIBUTE(resource_configuration_filters) --> A list of resource configuration filters, such 'en' that will limit the resources in the apk to only the ones in the 'en' configuration. diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index 529e10f7b7..642cac823d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -88,6 +88,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_SYMBOLS_TXT), ImmutableList.<String>of(), /* configurationFilters */ ImmutableList.<String>of(), /* uncompressedExtensions */ + false, /* crunchPng */ ImmutableList.<String>of(), /* densities */ null /* applicationId */, null /* versionCode */, 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 3e4ec6b69b..2c3606f1e1 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 @@ -78,6 +78,7 @@ public class AndroidResourcesProcessorBuilder { private Artifact manifestOut; private Artifact mergedResourcesOut; private boolean isLibrary; + private boolean crunchPng = true; /** * @param ruleContext The RuleContext that was used to create the SpawnAction.Builder. @@ -108,6 +109,11 @@ public class AndroidResourcesProcessorBuilder { return this; } + public AndroidResourcesProcessorBuilder setCrunchPng(boolean crunchPng) { + this.crunchPng = crunchPng; + return this; + } + public AndroidResourcesProcessorBuilder setDensities(List<String> densities) { this.densities = densities; return this; @@ -325,6 +331,9 @@ public class AndroidResourcesProcessorBuilder { if (!uncompressedExtensions.isEmpty()) { builder.addJoinStrings("--uncompressedExtensions", ",", uncompressedExtensions); } + if (!crunchPng) { + builder.add("--useAaptCruncher=no"); + } if (!assetsToIgnore.isEmpty()) { builder.addJoinStrings("--assetsToIgnore", ",", assetsToIgnore); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java index 05df106d88..0a66657ef0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java @@ -211,13 +211,14 @@ public final class ApplicationManifest { false, /* isLibrary */ resourceDeps, rTxt, - null, /* configurationFilters */ + null, /* symbolsTxt */ + ImmutableList.<String>of(), /* configurationFilters */ ImmutableList.<String>of(), /* uncompressedExtensions */ + true, /* crunchPng */ ImmutableList.<String>of(), /* densities */ - ImmutableList.<String>of(), /* String applicationId */ + null, /* String applicationId */ null, /* String versionCode */ null, /* String versionName */ - null, /* Artifact symbolsTxt */ incremental, data, proguardCfg, @@ -237,6 +238,7 @@ public final class ApplicationManifest { Artifact symbolsTxt, List<String> configurationFilters, List<String> uncompressedExtensions, + boolean crunchPng, List<String> densities, String applicationId, String versionCode, @@ -269,6 +271,7 @@ public final class ApplicationManifest { symbolsTxt, configurationFilters, uncompressedExtensions, + crunchPng, densities, applicationId, versionCode, @@ -288,6 +291,7 @@ public final class ApplicationManifest { Artifact symbolsTxt, List<String> configurationFilters, List<String> uncompressedExtensions, + boolean crunchPng, List<String> densities, String applicationId, String versionCode, @@ -319,6 +323,7 @@ public final class ApplicationManifest { .setApkOut(resourceContainer.getApk()) .setConfigurationFilters(configurationFilters) .setUncompressedExtensions(uncompressedExtensions) + .setCrunchPng(crunchPng) .setJavaPackage(resourceContainer.getJavaPackage()) .setDebug(ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT) .setManifestOut(manifestOut) diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index 0e233743d6..ba8e557f62 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -33,6 +33,7 @@ import com.android.builder.core.VariantConfiguration; import com.android.ide.common.internal.AaptCruncher; import com.android.ide.common.internal.CommandLineRunner; import com.android.ide.common.internal.LoggedErrorException; +import com.android.ide.common.internal.PngCruncher; import com.android.ide.common.res2.MergingException; import com.android.utils.StdLogger; @@ -249,8 +250,7 @@ public class AndroidResourceProcessingAction { mergedResources, mergedAssets, modifiers, - useAaptCruncher() ? new AaptCruncher(aaptConfigOptions.aapt.toString(), - new CommandLineRunner(STD_LOGGER)) : null, + selectPngCruncher(), true); LOGGER.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); @@ -288,7 +288,7 @@ public class AndroidResourceProcessingAction { options.resourcesOutput != null ? processedManifestData.getResourceDir().resolve("values").resolve("public.xml") : null); - LOGGER.fine(String.format("appt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); + LOGGER.fine(String.format("aapt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); if (options.manifestOutput != null) { resourceProcessor.copyManifestToOutput(processedManifestData, options.manifestOutput); @@ -326,7 +326,7 @@ public class AndroidResourceProcessingAction { LOGGER.fine(String.format("Resources processed in %sms", timer.elapsed(TimeUnit.MILLISECONDS))); } - private static boolean useAaptCruncher() { + private static boolean usePngCruncher() { // If the value was set, use that. if (aaptConfigOptions.useAaptCruncher != TriState.AUTO) { return aaptConfigOptions.useAaptCruncher == TriState.YES; @@ -334,4 +334,17 @@ public class AndroidResourceProcessingAction { // By default png cruncher shouldn't be invoked on a library -- the work is just thrown away. return options.packageType != VariantConfiguration.Type.LIBRARY; } + + private static PngCruncher selectPngCruncher() { + // Use the full cruncher if asked to do so. + if (usePngCruncher()) { + return new AaptCruncher(aaptConfigOptions.aapt.toString(), new CommandLineRunner(STD_LOGGER)); + } + // Otherwise, if this is a binary, we need to at least process nine-patch PNGs. + if (options.packageType != VariantConfiguration.Type.LIBRARY) { + return new NinePatchOnlyCruncher( + aaptConfigOptions.aapt.toString(), new CommandLineRunner(STD_LOGGER)); + } + return null; + } } diff --git a/src/tools/android/java/com/google/devtools/build/android/NinePatchOnlyCruncher.java b/src/tools/android/java/com/google/devtools/build/android/NinePatchOnlyCruncher.java new file mode 100644 index 0000000000..3957ab8c4a --- /dev/null +++ b/src/tools/android/java/com/google/devtools/build/android/NinePatchOnlyCruncher.java @@ -0,0 +1,50 @@ +// Copyright 2016 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.android; + +import com.google.common.io.Files; + +import com.android.SdkConstants; +import com.android.ide.common.internal.AaptCruncher; +import com.android.ide.common.internal.CommandLineRunner; +import com.android.ide.common.internal.LoggedErrorException; + +import java.io.File; +import java.io.IOException; + +/** + * A wrapper around a PNG cruncher that only processes nine-patch PNGs. + */ +public class NinePatchOnlyCruncher extends AaptCruncher { + + public NinePatchOnlyCruncher(String aaptLocation, CommandLineRunner commandLineRunner) { + super(aaptLocation, commandLineRunner); + } + + /** + * Runs the cruncher on a single file (or copies the file if no crunching is needed). + * + * @param from the file to process + * @param to the output file + */ + @Override + public void crunchPng(File from, File to) + throws InterruptedException, LoggedErrorException, IOException { + if (from.getPath().endsWith(SdkConstants.DOT_9PNG)) { + super.crunchPng(from, to); + } else { + Files.copy(from, to); + } + } +} |