From 374112c3cab43cb37b4e1d2cd9fcef5e402007ea Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Tue, 15 May 2018 10:19:25 -0700
Subject: Replace
 --experimental_android_enforce_strict_deps_for_binaries_under_test with a
 package whitelist

PiperOrigin-RevId: 196688645
---
 .../com/google/devtools/build/lib/rules/android/AndroidBinary.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 0b7706918c..5ab5c81b0e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -50,6 +50,7 @@ import com.google.devtools.build.lib.analysis.actions.ParameterFileWriteAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
+import com.google.devtools.build.lib.analysis.whitelisting.Whitelist;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -117,8 +118,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
         new AndroidCommon(
             javaCommon,
             /* asNeverLink= */ true,
-            /* exportDeps= */ !AndroidCommon.getAndroidConfig(ruleContext)
-                .getEnforceStrictDepsForBinariesUnderTest());
+            /* exportDeps= */ Whitelist.isAvailable(ruleContext, "export_deps"));
     ResourceDependencies resourceDeps =
         ResourceDependencies.fromRuleDeps(ruleContext, /* neverlink= */ false);
     RuleConfiguredTargetBuilder builder =
-- 
cgit v1.2.3