diff options
author | 2017-02-05 21:54:58 +0000 | |
---|---|---|
committer | 2017-02-06 19:35:52 +0000 | |
commit | 6ea992bc094550a045dca6833c58912a44f0b3b1 (patch) | |
tree | 699df275bb3e8518d570ebe02e1f57864bb78e7f | |
parent | 0e59bb626efc9ea992187f97735e0eea3e925700 (diff) |
Rollback filtering of objc headers
--
PiperOrigin-RevId: 146612144
MOS_MIGRATED_REVID=146612144
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java index fbef6c4256..2da5511875 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java @@ -72,7 +72,6 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.cpp.CcLinkParams; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider; import com.google.devtools.build.lib.rules.cpp.CppCompilationContext; -import com.google.devtools.build.lib.rules.cpp.CppFileTypes; import com.google.devtools.build.lib.rules.cpp.CppModuleMap; import com.google.devtools.build.lib.rules.cpp.LinkerInputs; import com.google.devtools.build.lib.syntax.Type; @@ -159,21 +158,6 @@ public final class ObjcCommon { private Iterable<CppCompilationContext> depCcHeaderProviders = ImmutableList.of(); private Iterable<CcLinkParamsProvider> depCcLinkProviders = ImmutableList.of(); - /** Filters directory artifacts (and other non-headers) out of a group of artifacts. */ - private static Iterable<Artifact> filterHeaders(Iterable<Artifact> headers) { - ImmutableList.Builder<Artifact> inputs = ImmutableList.<Artifact>builder(); - for (Artifact headerArtifact : headers) { - if (CppFileTypes.OBJC_HEADER.matches(headerArtifact.getFilename()) - || CppFileTypes.C_SOURCE.matches(headerArtifact.getFilename()) - || CppFileTypes.CPP_SOURCE.matches(headerArtifact.getFilename()) - || CppFileTypes.OBJC_SOURCE.matches(headerArtifact.getFilename()) - || CppFileTypes.OBJCPP_SOURCE.matches(headerArtifact.getFilename())) { - inputs.add(headerArtifact); - } - } - return inputs.build(); - } - /** * Builder for {@link ObjcCommon} obtaining both attribute data and configuration data from * the given rule context. @@ -479,8 +463,8 @@ public final class ObjcCommon { PathFragment.safePathStrings(attributes.sdkIncludes())), TO_PATH_FRAGMENT); objcProvider - .addAll(HEADER, filterHeaders(attributes.hdrs())) - .addAll(HEADER, filterHeaders(attributes.textualHdrs())) + .addAll(HEADER, attributes.hdrs()) + .addAll(HEADER, attributes.textualHdrs()) .addAll(INCLUDE, attributes.headerSearchPaths(buildConfiguration.getGenfilesFragment())) .addAll(INCLUDE, sdkIncludes) .addAll(SDK_FRAMEWORK, attributes.sdkFrameworks()) |