diff options
author | cushon <cushon@google.com> | 2018-07-03 22:28:44 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-07-03 22:30:09 -0700 |
commit | d292b34b97970b934a1061e13e2d67844bd083e7 (patch) | |
tree | 9ef9a60ca79a74a7366eaca72848eb5bdbae2bdc /src/main/java/com/google/devtools/build/lib/bazel | |
parent | 6b8c7ca48e9e48a9906c031346dc4a924b7ef559 (diff) |
Create a whitelist for android_library rules with deps but not srcs
PiperOrigin-RevId: 203230801
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/bazel')
2 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java index 7e91cdc941..3e6c180a56 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java @@ -70,6 +70,11 @@ public class BazelAndroidBinaryRule implements RuleDefinition { .add( Whitelist.getAttributeFromWhitelistName("export_deps") .value(environment.getToolsLabel("//tools/android:export_deps_whitelist"))) + .add( + Whitelist.getAttributeFromWhitelistName("allow_deps_without_srcs") + .value( + environment.getToolsLabel( + "//tools/android:allow_android_library_deps_without_srcs_whitelist"))) .cfg( new ConfigFeatureFlagTransitionFactory(AndroidFeatureFlagSetProvider.FEATURE_FLAG_ATTR)) .addRequiredToolchains(CppRuleClasses.ccToolchainTypeAttribute(environment)) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java index c7651cd08a..7cca4871e9 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.bazel.rules.android; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; +import com.google.devtools.build.lib.analysis.whitelisting.Whitelist; import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.rules.android.AndroidLibraryBaseRule; @@ -41,8 +42,12 @@ public class BazelAndroidLibraryRule implements RuleDefinition { <!-- #END_BLAZE_RULE.IMPLICIT_OUTPUTS --> */ .setImplicitOutputsFunction(AndroidRuleClasses.ANDROID_LIBRARY_IMPLICIT_OUTPUTS) .addRequiredToolchains(CppRuleClasses.ccToolchainTypeAttribute(env)) + .add( + Whitelist.getAttributeFromWhitelistName("allow_deps_without_srcs") + .value( + env.getToolsLabel( + "//tools/android:allow_android_library_deps_without_srcs_whitelist"))) .build(); - } @Override |