diff options
author | Googler <noreply@google.com> | 2016-12-02 18:05:25 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-12-02 19:09:09 +0000 |
commit | 9de9f374cf63e8e6938c9ce80820c9f46f641241 (patch) | |
tree | 138a4c82d83bdb125649245bb94f62938bb35d10 /src/main/java/com/google/devtools/build/lib/ideinfo | |
parent | e0a330577d9fe98169645cb68d9fc22cc787eeb6 (diff) |
Pass isExternal field to blaze ide info proto
--
PiperOrigin-RevId: 140862659
MOS_MIGRATED_REVID=140862659
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/ideinfo')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java | 6 |
1 files changed, 5 insertions, 1 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 ea7ae872b0..92288df9ba 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 @@ -19,6 +19,7 @@ import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTran import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -630,11 +631,13 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config return makeArtifactLocation(root, relativePath); } - private static ArtifactLocation makeArtifactLocation(Root root, PathFragment relativePath) { + @VisibleForTesting + static ArtifactLocation makeArtifactLocation(Root root, PathFragment relativePath) { return ArtifactLocation.newBuilder() .setRootExecutionPathFragment(root.getExecPath().toString()) .setRelativePath(relativePath.toString()) .setIsSource(root.isSourceRoot()) + .setIsExternal(!root.isMainRepo()) .build(); } @@ -643,6 +646,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config .setRootExecutionPathFragment(resourceDir.getRootExecutionPathFragment().toString()) .setRelativePath(resourceDir.getRelativePath().toString()) .setIsSource(resourceDir.isSource()) + .setIsExternal(false) .build(); } |