diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 2 |
2 files changed, 7 insertions, 3 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 f2f9fc950d..ea087d2f88 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 @@ -441,7 +441,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { ruleContext, resourceApk, proguardSpecs, - proguardOutput); + proguardOutput, + filesBuilder); } Artifact jarToDex = proguardOutput.getOutputJar(); @@ -1087,7 +1088,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { RuleContext ruleContext, ResourceApk resourceApk, ImmutableList<Artifact> proguardSpecs, - ProguardOutput proguardOutput) throws InterruptedException { + ProguardOutput proguardOutput, + NestedSetBuilder<Artifact> filesBuilder) throws InterruptedException { if (LocalResourceContainer.definesAndroidResources(ruleContext.attributes()) && !proguardSpecs.isEmpty()) { @@ -1110,6 +1112,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { .setUncompressedExtensions( ruleContext.getTokenizedStringListAttr("nocompress_extensions")) .build(); + filesBuilder.add(ruleContext.getImplicitOutputArtifact( + AndroidRuleClasses.ANDROID_RESOURCE_SHRINKER_LOG)); return new ResourceApk(apk, resourceApk.getResourceJavaSrcJar(), resourceApk.getResourceJavaClassJar(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 9148e849f9..3ec2bb41a6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -95,7 +95,7 @@ public final class AndroidRuleClasses { public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_SHRUNK_ZIP = fromTemplates("%{name}_files/resource_files_shrunk.zip"); public static final SafeImplicitOutputsFunction ANDROID_RESOURCE_SHRINKER_LOG = - fromTemplates("%{name}_files/resource_shrinker_log.txt"); + fromTemplates("%{name}_files/resource_shrinker.log"); public static final SafeImplicitOutputsFunction ANDROID_INCREMENTAL_RESOURCES_APK = fromTemplates("%{name}_files/incremental.ap_"); public static final SafeImplicitOutputsFunction ANDROID_BINARY_APK = |