aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-08-16 21:57:05 +0200
committerGravatar Irina Iancu <elenairina@google.com>2017-08-17 09:54:18 +0200
commit24ed1ef4c3ad64ec63e46fdde3122d66e6d9a07f (patch)
treeb7ab4c7ccd0bfa920bbc49b06804854da3bcae24 /src/main
parentd63ee814e2493bc74b74842744a8471a0aeeb0ef (diff)
Filter out non-aidl files out of idl_preprocessed param if the passed in value
is a target. RELNOTES: None PiperOrigin-RevId: 165482057
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
index 7e0dfbb075..e989585742 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
@@ -486,7 +486,10 @@ public class AndroidIdlHelper {
/** Returns the idl_preprocessed defined on the given rule. */
private static Collection<Artifact> getIdlPreprocessed(RuleContext ruleContext) {
return ruleContext.isAttrDefined("idl_preprocessed", BuildType.LABEL_LIST)
- ? ruleContext.getPrerequisiteArtifacts("idl_preprocessed", Mode.TARGET).list()
+ ? ruleContext
+ .getPrerequisiteArtifacts("idl_preprocessed", Mode.TARGET)
+ .filter(AndroidRuleClasses.ANDROID_IDL)
+ .list()
: ImmutableList.<Artifact>of();
}
}