Plumb customPackage to RClassGenerator and skip empty R classes

Forgot to do this, so we get compiler errors
since it can't find the R class imported under
the requested custom java package.

Also, avoid writing out the top-level R.class
file if there are no symbols. There is a test
that happens to check for this.

--
MOS_MIGRATED_REVID=127888913

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
index 973966943b..933790a9c0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.rules.android;
 
 import com.google.common.base.Function;
+import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -27,10 +28,8 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.rules.android.AndroidResourcesProvider.ResourceContainer;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
@@ -114,6 +113,9 @@ public class RClassGeneratorActionBuilder {
       builder.addExecPath("--primaryManifest", primary.getManifest());
       inputs.add(primary.getManifest());
     }
+    if (!Strings.isNullOrEmpty(primary.getJavaPackage())) {
+      builder.add("--packageForR").add(primary.getJavaPackage());
+    }
     if (dependencies != null) {
       Iterable<ResourceContainer> depResources = dependencies.getResources();
       if (depResources.iterator().hasNext()) {