From 2f745382cdc4404840c99f12e622afe537a25919 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Tue, 9 Feb 2016 18:16:55 +0000 Subject: Add JavaSkylarkApiProvider to all Java rules. -- MOS_MIGRATED_REVID=114232294 --- .../google/devtools/build/lib/rules/android/AndroidLibrary.java | 2 -- .../com/google/devtools/build/lib/rules/java/JavaCommon.java | 1 + .../com/google/devtools/build/lib/rules/java/JavaImport.java | 1 - .../com/google/devtools/build/lib/rules/java/JavaLibrary.java | 1 - .../devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java | 8 -------- .../java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl | 9 +++++++-- 6 files changed, 8 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index b598babc28..db26843176 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -33,7 +33,6 @@ import com.google.devtools.build.lib.rules.java.JavaCommon; import com.google.devtools.build.lib.rules.java.JavaNeverlinkInfoProvider; import com.google.devtools.build.lib.rules.java.JavaPluginInfoProvider; import com.google.devtools.build.lib.rules.java.JavaSemantics; -import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider; import com.google.devtools.build.lib.rules.java.JavaSourceInfoProvider; import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider; import com.google.devtools.build.lib.rules.java.JavaTargetAttributes; @@ -182,7 +181,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { return builder .add(AndroidNativeLibraryProvider.class, new AndroidNativeLibraryProvider(transitiveNativeLibraries)) - .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider()) .add(JavaNeverlinkInfoProvider.class, new JavaNeverlinkInfoProvider(androidCommon.isNeverLink())) .add(JavaSourceInfoProvider.class, diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index 470b8a166e..0839da12c2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -571,6 +571,7 @@ public class JavaCommon { addInstrumentationFilesProvider(builder, filesToBuild, instrumentationSpec); builder .add(JavaExportsProvider.class, new JavaExportsProvider(collectTransitiveExports())) + .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider()) .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, getFilesToCompile(classJar)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java index 69e4963b37..c62ed4a25c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java @@ -155,7 +155,6 @@ public class JavaImport implements RuleConfiguredTargetFactory { .add(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider.build()) .add(JavaRuntimeJarProvider.class, new JavaRuntimeJarProvider(common.getJavaCompilationArtifacts().getRuntimeJars())) - .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider()) .add(JavaNeverlinkInfoProvider.class, new JavaNeverlinkInfoProvider(neverLink)) .add(RunfilesProvider.class, RunfilesProvider.simple(runfiles)) .add(CcLinkParamsProvider.class, new CcLinkParamsProvider(ccLinkParamsStore)) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java index 6dcc700932..2de5f97c53 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java @@ -176,7 +176,6 @@ public class JavaLibrary implements RuleConfiguredTargetFactory { new JavaRuntimeJarProvider(common.getJavaCompilationArtifacts().getRuntimeJars())) .add(RunfilesProvider.class, RunfilesProvider.simple(common.getRunfiles(neverLink))) .setFilesToBuild(filesToBuild) - .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider()) .add(JavaNeverlinkInfoProvider.class, new JavaNeverlinkInfoProvider(neverLink)) .add(CppCompilationContext.class, transitiveCppDeps) .add(JavaCompilationArgsProvider.class, new JavaCompilationArgsProvider( diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java index 50c7bcd5f3..468ff73952 100644 --- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java +++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java @@ -487,10 +487,6 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase @Test public void testJavaTest() throws Exception { - if (!isNativeTest()) { - return; - } - scratch.file( "java/com/google/example/BUILD", "java_library(", @@ -528,10 +524,6 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase @Test public void testJavaBinary() throws Exception { - if (!isNativeTest()) { - return; - } - scratch.file( "com/google/example/BUILD", "java_library(", diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl index 1f839d36bb..f6ab0e3e49 100644 --- a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl +++ b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl @@ -44,6 +44,10 @@ def get_kind(target, ctx): def is_java_rule(target, ctx): return ctx.rule.kind != "android_sdk"; +def struct_omit_none(**kwargs): + d = {name: kwargs[name] for name in kwargs if kwargs[name] != None} + return struct(**d) + def artifact_location(file): if file == None: return None @@ -56,7 +60,7 @@ def artifact_location(file): def library_artifact(java_output): if java_output == None: return None - return struct( + return struct_omit_none( jar = artifact_location(java_output.class_jar), interface_jar = artifact_location(java_output.ijar), source_jar = artifact_location(java_output.source_jar), @@ -72,7 +76,8 @@ def java_rule_ide_info(target, ctx): jars = [library_artifact(output) for output in target.java.outputs.jars] ide_resolve_files = set([jar for jar in [output.class_jar, output.ijar, output.source_jar] - for output in target.java.outputs.jars]) + for output in target.java.outputs.jars + if jar != None]) jdeps = artifact_location(target.java.outputs.jdeps) return (struct(sources = sources, -- cgit v1.2.3