diff options
| author |  cushon <cushon@google.com> | 2018-05-15 10:19:25 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-15 10:20:43 -0700 |
| commit | 374112c3cab43cb37b4e1d2cd9fcef5e402007ea (patch) | |
| tree | 6722b965cedbddb2e978682a2ea49fdb5ee16f81 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | |
| parent | 905291b7f69f316d4af885d51768dadf7accd9c9 (diff) | |
Replace --experimental_android_enforce_strict_deps_for_binaries_under_test with a package whitelist
PiperOrigin-RevId: 196688645
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 = |