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/AndroidBinaryMobileInstall.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/AndroidBinaryMobileInstall.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java index 0c8d4cf7cb..b344411ba8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java @@ -101,6 +101,7 @@ public final class AndroidBinaryMobileInstall { .addMobileInstallStubApplication(ruleContext) .packIncrementalBinaryWithDataAndResources( ruleContext, + dataContext, ruleContext.getImplicitOutputArtifact( AndroidRuleClasses.ANDROID_INCREMENTAL_RESOURCES_APK), resourceDeps, @@ -114,6 +115,7 @@ public final class AndroidBinaryMobileInstall { .createSplitManifest(ruleContext, "android_resources", false) .packIncrementalBinaryWithDataAndResources( ruleContext, + dataContext, getMobileInstallArtifact(ruleContext, "android_resources.ap_"), resourceDeps, ruleContext.getExpander().withDataLocations().tokenized("nocompress_extensions"), |