Rollback of commit 5c548f11e20c0b75203e9fe4ab682ed0418064cf.

*** Reason for rollback ***

Fixed depot issues.

*** Original change description ***

Automated [] rollback of commit 2e5ec0fd99ac4bfd930da99f6089dc5faf778464.

*** Reason for rollback ***

Breaks some targets in the nightly: see []

*** Original change description ***

Make java_proto_library's strict_deps default to true.
Remove package-level attribute to set the default of strict_deps.
Change the semantics to --strict_deps_java_protos to mean force strict deps of all Java protos to be true regardless of their strict_deps attribute.

--
MOS_MIGRATED_REVID=133981754

1 files changed, 0 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index f1d9b51878..cbd672e728 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -139,9 +139,6 @@ public class Package {
    */
   private String defaultHdrsCheck;
 
-  /** See getter. */
-  private TriState defaultStrictDepsJavaProtos = TriState.AUTO;
-
   /** Default copts for cc_* rules. The rules' individual copts will append to this value. */
   private ImmutableList<String> defaultCopts;
 
@@ -587,15 +584,6 @@ public class Package {
     return defaultDeprecation;
   }
 
-  /**
-   * Default for 'strict_deps' of Java proto rules, when they aren't explicitly specified.
-   *
-   * <p>A value of AUTO is returned when the package didn't itself explicitly specify this value.
-   */
-  public TriState getDefaultStrictDepsJavaProtos() {
-    return defaultStrictDepsJavaProtos;
-  }
-
   /** Gets the default header checking mode. */
   public String getDefaultHdrsCheck() {
     return defaultHdrsCheck != null ? defaultHdrsCheck : "strict";
@@ -912,11 +900,6 @@ public class Package {
       return this;
     }
 
-    public Builder setDefaultStrictDepsJavaProtos(TriState value) {
-      pkg.defaultStrictDepsJavaProtos = value;
-      return this;
-    }
-
     /** Sets the default value of copts. Rule-level copts will append to this. */
     public Builder setDefaultCopts(List<String> defaultCopts) {
       this.defaultCopts = defaultCopts;