From 545dce5b0fb3867597455837a925e037201e4ea4 Mon Sep 17 00:00:00 2001
From: Carmi Grushko <carmi@google.com>
Date: Wed, 18 Jan 2017 16:13:11 +0000
Subject: If --strict_proto_deps=default and a proto_library didn't specify
 strict_proto_deps, then strictness is enforced.

--
PiperOrigin-RevId: 144836042
MOS_MIGRATED_REVID=144836042
---
 .../java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java     | 2 +-
 src/tools/android/java/com/google/devtools/build/android/proto/BUILD    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
index 80bd133607..a08a022f02 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -221,6 +221,6 @@ public class ProtoCommon {
       return true;
     }
 
-    return false;
+    return true;
   }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/proto/BUILD b/src/tools/android/java/com/google/devtools/build/android/proto/BUILD
index 8b28e76d02..fa3e5abd18 100644
--- a/src/tools/android/java/com/google/devtools/build/android/proto/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/proto/BUILD
@@ -10,6 +10,7 @@ java_proto_library(
 proto_library(
     name = "serialize_format_proto",
     srcs = ["serialize_format.proto"],
+    strict_proto_deps = 0,
 )
 
 filegroup(
-- 
cgit v1.2.3