Rollback of commit 9de9f374cf63e8e6938c9ce80820c9f46f641241.

*** Reason for rollback ***

Broke ci.bazel.io

See http://ci.bazel.io/job/bazel-tests/BAZEL_VERSION=HEAD-jdk7,PLATFORM_NAME=linux-x86_64/379/console for error log.
See https://cr.bazel.build/7610/ for tests that confirm fix.

*** Original change description ***

Pass isExternal field to blaze ide info proto

--
Change-Id: Ieff9fbc719ea7baf8321bf50570fae5f7d6c7fdd
Reviewed-on: https://cr.bazel.build/7610
PiperOrigin-RevId: 141029777
MOS_MIGRATED_REVID=141029777

1 files changed, 1 insertions, 5 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 92288df9ba..ea7ae872b0 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,7 +19,6 @@ 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;
@@ -631,13 +630,11 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
     return makeArtifactLocation(root, relativePath);
   }
 
-  @VisibleForTesting
-  static ArtifactLocation makeArtifactLocation(Root root, PathFragment relativePath) {
+  private static ArtifactLocation makeArtifactLocation(Root root, PathFragment relativePath) {
     return ArtifactLocation.newBuilder()
         .setRootExecutionPathFragment(root.getExecPath().toString())
         .setRelativePath(relativePath.toString())
         .setIsSource(root.isSourceRoot())
-        .setIsExternal(!root.isMainRepo())
         .build();
   }
 
@@ -646,7 +643,6 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
         .setRootExecutionPathFragment(resourceDir.getRootExecutionPathFragment().toString())
         .setRelativePath(resourceDir.getRelativePath().toString())
         .setIsSource(resourceDir.isSource())
-        .setIsExternal(false)
         .build();
   }