diff options
author | 2016-09-20 21:57:05 +0000 | |
---|---|---|
committer | 2016-09-21 07:14:22 +0000 | |
commit | 7d391c5dd8fd05a7e9a21a6bedc898c2a53432d4 (patch) | |
tree | cc41bb6eded8a2c94ed7c7e8bfe029e20151e801 /src/main | |
parent | c1b7881023046b6764f312087849386db81d91f7 (diff) |
Remove absolute paths from proto
RELNOTES: Remove deprecated absolute paths in blaze IDE artifacts
--
MOS_MIGRATED_REVID=133758389
Diffstat (limited to 'src/main')
3 files changed, 1 insertions, 22 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 c7e3cd5613..9814a938ef 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 @@ -320,14 +320,6 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config outputBuilder.setLabel(base.getLabel().toString()); - outputBuilder.setBuildFile( - ruleContext - .getRule() - .getPackage() - .getBuildFile() - .getPath() - .toString()); - outputBuilder.setBuildFileArtifactLocation( makeArtifactLocation(ruleContext.getRule().getPackage())); @@ -458,8 +450,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config Root root = artifact.getRoot(); return Joiner.on(",").join( root.getExecPath().toString(), - artifact.getRootRelativePath().toString(), - root.getPath().toString() // Remove me once we remove ArtifactLocation root + artifact.getRootRelativePath().toString() ); } }; @@ -596,7 +587,6 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config private static ArtifactLocation makeArtifactLocation(Root root, PathFragment relativePath) { return ArtifactLocation.newBuilder() - .setRootPath(root.getPath().toString()) .setRootExecutionPathFragment(root.getExecPath().toString()) .setRelativePath(relativePath.toString()) .setIsSource(root.isSourceRoot()) @@ -605,7 +595,6 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config private static ArtifactLocation makeArtifactLocation(SourceDirectory resourceDir) { return ArtifactLocation.newBuilder() - .setRootPath(resourceDir.getRootPath().toString()) .setRootExecutionPathFragment(resourceDir.getRootExecutionPathFragment().toString()) .setRelativePath(resourceDir.getRelativePath().toString()) .setIsSource(resourceDir.isSource()) diff --git a/src/main/protobuf/android_studio_ide_info.proto b/src/main/protobuf/android_studio_ide_info.proto index fd5aa89372..3cc0806f93 100644 --- a/src/main/protobuf/android_studio_ide_info.proto +++ b/src/main/protobuf/android_studio_ide_info.proto @@ -21,9 +21,6 @@ option java_package = "com.google.devtools.build.lib.ideinfo.androidstudio"; message ArtifactLocation { - // deprecated -- this is not machine agnostic and will be removed in a future release - string root_path = 1 [deprecated=true]; - string relative_path = 2; bool is_source = 3; @@ -132,8 +129,6 @@ message RuleIdeInfo { string label = 1; Kind kind = 2 [deprecated=true]; - // deprecated -- this is not machine agnostic and will be removed in a future release - string build_file = 3 [deprecated=true]; repeated string dependencies = 4; // kind is one of {JAVA,ANDROID}_{LIBRARY,BINARY,TEST} and JAVA_IMPORT diff --git a/src/main/protobuf/package_manifest.proto b/src/main/protobuf/package_manifest.proto index 3ae7f46d09..aa017d410f 100644 --- a/src/main/protobuf/package_manifest.proto +++ b/src/main/protobuf/package_manifest.proto @@ -22,9 +22,6 @@ option java_package = "com.google.devtools.build.lib.ideinfo.androidstudio"; // TODO(bazel-team): support proto => proto dependencies and remove this duplication message ArtifactLocation { - // deprecated -- this is not machine agnostic and will be removed in a future release - string root_path = 1 [deprecated=true]; - string relative_path = 2; bool is_source = 3; @@ -33,8 +30,6 @@ message ArtifactLocation { } message JavaSourcePackage { - // deprecated -- this is not machine agnostic and will be removed in a future release - string absolute_path = 1 [deprecated=true]; string package_string = 2; ArtifactLocation artifact_location = 3; } |