aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-02-02 18:05:05 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-02-02 18:13:59 +0000
commitb65067ee16680416d575996021af8dc6f7940132 (patch)
tree793044fcdbb6665159c4b237ae627ef66ba4af7c
parentc74d3e4d9f2340c4a53f818f052df72a824660c0 (diff)
Handle not having any dependent packages correctly.
-- MOS_MIGRATED_REVID=113648546
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index 6865d69905..d0a6962ac6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -177,13 +177,13 @@ public class AndroidResourceProcessor {
if (stdLogger.getLevel() == StdLogger.Level.VERBOSE) {
command.add("-v");
}
-
+
// Overwrite existing files, if they exist.
command.add("-f");
-
+
// Resources are precrunched in the merge process.
command.add("--no-crunch");
-
+
// Add the android.jar as a base input.
command.add("-I");
command.add(androidJar.toString());
@@ -238,7 +238,7 @@ public class AndroidResourceProcessor {
command.add("--non-constant-id");
}
- if (variantType == VariantConfiguration.Type.DEFAULT) {
+ if (variantType == VariantConfiguration.Type.DEFAULT && !packages.isEmpty()) {
// Generate the dependent R and Manifest files.
command.add("--extra-packages");
command.add(Joiner.on(":").join(packages));