aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2015-11-18 21:35:09 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-11-19 10:04:26 +0000
commitd59c7618d359e8dedca45fbbd7a172ccf5953775 (patch)
treec4d31336259b8841795496d7a5a1e6ed260099be /src/main/java/com/google
parentdd00dcecfcfb2458ed5f4c05deef407717cea0aa (diff)
Add generate_resource_class to android_studio_ide_info.proto.
This boolean matches bazel's semantics on whether a R.java class should be generated. Android Studio generates its own in-memory class, but we need to know *whether* we should generate one. -- MOS_MIGRATED_REVID=108175802
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r--src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
index dc3d6f0f3b..afe1d49349 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
@@ -51,6 +51,7 @@ import com.google.devtools.build.lib.rules.android.AndroidCommon;
import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider;
import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider.SourceDirectory;
import com.google.devtools.build.lib.rules.android.AndroidSdkProvider;
+import com.google.devtools.build.lib.rules.android.LocalResourceContainer;
import com.google.devtools.build.lib.rules.java.JavaExportsProvider;
import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
@@ -351,6 +352,9 @@ public class AndroidStudioInfoAspect implements ConfiguredNativeAspectFactory {
}
}
+ builder.setGenerateResourceClass(
+ LocalResourceContainer.definesAndroidResources(ruleContext.attributes()));
+
return builder.build();
}