diff --git a/proto/BUILD b/proto/BUILD index b6ac6c54ebe..6ef115f9abf 100644 --- a/proto/BUILD +++ b/proto/BUILD @@ -125,10 +125,10 @@ java_library( ":project_data_java_proto", "//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//third_party/bazel/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto", - "//third_party/bazel/src/main/protobuf:android_deploy_info_java_proto", "//third_party/bazel/src/main/protobuf:build_java_proto", "//third_party/bazel/src/main/protobuf:command_line_java_proto", "//third_party/bazel/src/main/protobuf:deps_java_proto", "@com_google_protobuf//:protobuf_java", + "@rules_android//src/tools/deploy_info/proto:android_deploy_info_java_proto", ], ) diff --git a/third_party/bazel/src/main/protobuf/BUILD b/third_party/bazel/src/main/protobuf/BUILD index 45529c3b487..96ac6091903 100644 --- a/third_party/bazel/src/main/protobuf/BUILD +++ b/third_party/bazel/src/main/protobuf/BUILD @@ -299,10 +299,7 @@ cc_proto_library( filegroup( name = "srcs", - srcs = glob( - ["**"], - exclude = ["android_deploy_info.proto"], - ), + srcs = glob(["**"]), ) filegroup( diff --git a/third_party/bazel/src/main/protobuf/android_deploy_info.proto b/third_party/bazel/src/main/protobuf/android_deploy_info.proto deleted file mode 100644 index d491e5623ac..00000000000 --- a/third_party/bazel/src/main/protobuf/android_deploy_info.proto +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2016 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package blaze; - -// option java_api_version = 2; -option java_package = "com.google.devtools.build.lib.rules.android.deployinfo"; - -message Artifact { - // This path is relative to "bazel info execution_root" - string exec_root_path = 1; - - // Points to a globally valid URI whenever possible. - // See BuildEventStreamOptions.java - string canonical_uri = 2; -} - -// Information about how to deploy and launch the result of an android build -message AndroidDeployInfo { - // The merged manifest in the resource APK - Artifact merged_manifest = 1; - - // Merged manifests of dependencies - repeated Artifact additional_merged_manifests = 2; - - // If the build supports an external deploy, this will have the APKs. - // mobile-install does its own deployment, so this list will be empty - repeated Artifact apks_to_deploy = 3; - - // Unused - repeated Artifact data_to_deploy = 4; - - // Used by mobile-install - string manifest_package_name = 5; -}