diff options
| author |  asteinb <asteinb@google.com> | 2018-05-25 11:16:34 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-25 11:17:48 -0700 |
| commit | c2cf1132a75d03cc37888fe8c2b9583c7ce198c5 (patch) | |
| tree | 77d981b934797bb9e335cabf1c9c496023bb74e9 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | |
| parent | 2643d4b7543403eae52c038e769231f539938195 (diff) | |
Automated rollback of commit 372fbc2f016157b0331f83a20edad10d4b4cf9f7.
*** Reason for rollback ***
Roll forward with fix:
I was assuming that R.txt and symbols files are always set, but they can be
null in some cases (especially in the old data processing pipeline). Properly
handle them here.
RELNOTES: none
PiperOrigin-RevId: 198075743
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index e32d12c1b2..2dccf13cb6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -117,6 +117,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor resourceApk = applicationManifest.packBinaryWithDataAndResources( ruleContext, + dataContext, ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_APK), resourceDependencies, ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_R_TXT), |