diff options
| author |  dannark <dannark@google.com> | 2017-11-13 20:50:56 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-13 20:52:51 -0800 |
| commit | 9c371f20f9470f134c2c3713ba1541e23642ec72 (patch) | |
| tree | f6b5d8283bf3abbfa2331ebfac1d98592570acb7 /src/main/java | |
| parent | f581da7375d8548ffaac61ead74cdc3519eeb5b2 (diff) | |
RELNOTES: None
PiperOrigin-RevId: 175630707
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 2 |
2 files changed, 5 insertions, 1 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 be2a972b68..7819939bb0 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 @@ -515,11 +515,13 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { if (proguardOutput.getMapping() != null) { finalProguardMap = ruleContext.getImplicitOutputArtifact(JavaSemantics.JAVA_BINARY_PROGUARD_MAP); - Artifact finalRexPackageMap = getDxArtifact(ruleContext, "rex_output_package.map"); + Artifact finalRexPackageMap = + ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.REX_OUTPUT_PACKAGE_MAP); rexActionBuilder .addInput(proguardOutput.getMapping()) .addOutput(finalProguardMap) .addOutput(finalRexPackageMap); + filesBuilder.add(finalRexPackageMap); commandLine .addExecPath("--proguard_input_map", proguardOutput.getMapping()) .addExecPath("--proguard_output_map", finalProguardMap) 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 0d9fbb7d50..91e6ee6587 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 @@ -165,6 +165,8 @@ public final class AndroidRuleClasses { fromTemplates("%{name}_files/deploy_info_incremental.deployinfo.pb"); public static final SafeImplicitOutputsFunction DEPLOY_INFO_SPLIT = fromTemplates("%{name}_files/deploy_info_split.deployinfo.pb"); + public static final SafeImplicitOutputsFunction REX_OUTPUT_PACKAGE_MAP = + fromTemplates("%{name}_rex/rex_output_package.map"); // This needs to be in its own directory because ApkBuilder only has a function (-rf) for source // folders but not source files, and it's easiest to guarantee that nothing gets put beside this |