diff options
author | Googler <noreply@google.com> | 2016-02-16 15:25:28 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-02-16 15:59:29 +0000 |
commit | 3f80c72b6744abe9d4139c90e475a6123b1a38e2 (patch) | |
tree | 02c8a8366d4f50518c4e7ec85dded196f64543d1 /src/main/protobuf/package_manifest.proto | |
parent | 257337638463d01bcf627c60de42861d775fefec (diff) |
Roll forward of commit 500175fcfb37953f50cf0869df164902755807f2: Don't include absolute paths in blaze IDE
artifacts
NEW: Fixed bazel java_test rules
Rollback of commit a4ba24e286b7e9a7a09e333d8eb64a8cf7e81895.
*** Reason for rollback ***
Rollforward, fixing bazel java_test rules
*** Original change description ***
Automated [] rollback of commit 500175fcfb37953f50cf0869df164902755807f2.
*** Reason for rollback ***
Breaks Bazel Build
http://ci.bazel.io/job/Bazel/JAVA_VERSION=1.7,PLATFORM_NAME=linux-x86_64/356/console
*** Original change description ***
Don't include absolute paths in blaze IDE artifacts
RELNOTES: Don't include absolute paths in blaze IDE artifacts
--
MOS_MIGRATED_REVID=114751236
Diffstat (limited to 'src/main/protobuf/package_manifest.proto')
-rw-r--r-- | src/main/protobuf/package_manifest.proto | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/main/protobuf/package_manifest.proto b/src/main/protobuf/package_manifest.proto index dd5f4fc35a..b714f8ad26 100644 --- a/src/main/protobuf/package_manifest.proto +++ b/src/main/protobuf/package_manifest.proto @@ -21,9 +21,23 @@ option java_package = "com.google.devtools.build.lib.ideinfo.androidstudio"; option java_generate_equals_and_hash = true; +// 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; + + // set for derived artifacts (isSource = false) + string root_execution_path_fragment = 4; +} + message JavaSourcePackage { - string absolute_path = 1; + // 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; } message PackageManifest { |