diff options
author | Googler <noreply@google.com> | 2016-06-14 13:43:07 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2016-06-15 08:34:36 +0000 |
commit | f7b5e46edc17d3316b7e1df7a3e522039723b35e (patch) | |
tree | d34a690dcbcb50f3582650851952d63da820a115 /src | |
parent | 591d1e15740c9eeb85940291e5b10dd8f49a88b7 (diff) |
Fix android deps always being exported in skylark aspect.
--
MOS_MIGRATED_REVID=124832306
Diffstat (limited to 'src')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java | 26 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl | 2 |
2 files changed, 27 insertions, 1 deletions
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 d74a44adad..de4392f844 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 @@ -891,6 +891,32 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase } @Test + public void testAndroidLibraryExportsDoNotOverReport() throws Exception { + scratch.file( + "com/google/example/BUILD", + "android_library(", + " name = 'lib',", + " deps = [':middle'],", + ")", + "android_library(", + " name = 'middle',", + " srcs = ['Middle.java'],", + " deps = [':exported'],", + ")", + "android_library(", + " name = 'exported',", + " srcs = ['Exported.java'],", + ")"); + Map<String, RuleIdeInfo> ruleIdeInfos = buildRuleIdeInfo("//com/google/example:lib"); + RuleIdeInfo ruleInfo = getRuleInfoAndVerifyLabel("//com/google/example:lib", ruleIdeInfos); + RuleIdeInfo javaToolchain = Iterables.getOnlyElement(findJavaToolchain(ruleIdeInfos)); + assertThat(ruleInfo.getDependenciesList()).containsExactly( + javaToolchain.getLabel(), + "//com/google/example:middle" + ); + } + + @Test public void testSourceFilesAreCorrectlyMarkedAsSourceOrGenerated() throws Exception { scratch.file( "com/google/example/BUILD", 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 75d6ce564c..45719b8479 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 @@ -412,7 +412,7 @@ def _aspect_impl(target, ctx): export_deps = set([str(l) for l in target.java.transitive_exports]) # Empty android libraries export all their dependencies. if ctx.rule.kind == "android_library": - if not hasattr(rule_attrs, "src") or not ctx.rule.attr.src: + if not hasattr(rule_attrs, "srcs") or not ctx.rule.attr.srcs: export_deps = export_deps | compiletime_deps # runtime_deps |