Disable --treat_srcjars_as_srcs_for_strict_deps flag

The default behaviour is now to count srcjars as sources. The flag will be
removed after the next release.

--
MOS_MIGRATED_REVID=103747858

2 files changed, 4 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 8f7e51b857..0ec0aa0fe5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -586,10 +586,7 @@ public class AndroidCommon {
     transitiveSourceJars = javaCommon.collectTransitiveSourceJars(srcJar);
 
     if (collectJavaCompilationArgs) {
-      boolean includeSrcjars =
-          ruleContext.getFragment(AndroidConfiguration.class).treatSrcjarsAsSrcsForStrictDeps();
-      boolean hasSources =
-          attributes.hasSourceFiles() || (includeSrcjars && attributes.hasSourceJars());
+      boolean hasSources = attributes.hasSourceFiles() || attributes.hasSourceJars();
       this.javaCompilationArgs =
           collectJavaCompilationArgs(ruleContext, exportDeps, asNeverLink, hasSources);
       this.recursiveJavaCompilationArgs = collectJavaCompilationArgs(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 40bfe225be..592a9b17c9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -165,10 +165,9 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     // TODO(cushon): enable by default, then delete the flag
     @Option(
       name = "treat_srcjars_as_srcs_for_strict_deps",
-      defaultValue = "false",
-      category = "semantics",
-      help = "Causes deps of android_library rules with .srcjars (but no Java srcs)"
-          + " to be promoted to exports."
+      defaultValue = "true",
+      category = "undocumented",
+      help = "No-op. Kept here for backwards compatibility."
     )
     public boolean treatSrcjarsAsSrcsForStrictDeps;
 
@@ -259,7 +258,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final Label proguard;
   private final boolean useJackForDexing;
   private final boolean jackSanityChecks;
-  private final boolean treatSrcjarsAsSrcsForStrictDeps;
 
   AndroidConfiguration(Options options) {
     this.sdk = options.realSdk();
@@ -272,7 +270,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.proguard = options.proguard;
     this.useJackForDexing = options.useJackForDexing;
     this.jackSanityChecks = options.jackSanityChecks;
-    this.treatSrcjarsAsSrcsForStrictDeps = options.treatSrcjarsAsSrcsForStrictDeps;
   }
 
   public String getCpu() {
@@ -310,14 +307,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return jackSanityChecks;
   }
 
-  /**
-   * Returns true if srcjars should be treated as sources when deciding to promote
-   * deps to exports for Strict Java Deps.
-   */
-  public boolean treatSrcjarsAsSrcsForStrictDeps() {
-    return treatSrcjarsAsSrcsForStrictDeps;
-  }
-
   public boolean useIncrementalNativeLibs() {
     return incrementalNativeLibs;
   }