aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android
diff options
context:
space:
mode:
authorGravatar Julio Merino <jmmv@google.com>2016-02-23 12:48:41 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-02-23 13:10:16 +0000
commit7588e13b10b8a4eb36c5f8ef4354b4ac40fd9425 (patch)
treec3f4eb37393281235b57578ba9f0cbe8723f3723 /src/tools/android
parent3633955521721c06ef6c2213ab9ba73a871095e0 (diff)
Rename proto dependencies to include a _java component in them.
While doing this, homogenize the two dependencies on build.proto (via build_proto and build_proto_v2) into a single build_java_proto. -- MOS_MIGRATED_REVID=115328219
Diffstat (limited to 'src/tools/android')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/BUILD2
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD2
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD
index 5a7f5d5289..094c9dc3cc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -45,7 +45,7 @@ java_library(
srcs = glob(["*.java"]),
deps = [
"//src/main/java/com/google/devtools/common/options",
- "//src/main/protobuf:package_manifest_proto",
+ "//src/main/protobuf:package_manifest_java_proto",
"//third_party:android_common",
"//third_party:apache_commons_compress",
"//third_party:asm",
diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
index b520a81b3a..a964bf6a56 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -29,7 +29,7 @@ java_library(
],
deps = [
"//src/main/java/com/google/devtools/common/options",
- "//src/main/protobuf:package_manifest_proto",
+ "//src/main/protobuf:package_manifest_java_proto",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jsr305",
diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
index 3ff8a76912..68bf0a393f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
@@ -30,7 +30,7 @@ java_library(
deps = [
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
"//src/main/java/com/google/devtools/common/options",
- "//src/main/protobuf:java_compilation_proto",
+ "//src/main/protobuf:java_compilation_java_proto",
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jsr305",