Commit b9433070 authored by Samuel Giddins's avatar Samuel Giddins

[HeadersStore] Unique search paths per-store, rather than per-subdirectory

parent 146221b1
...@@ -58,12 +58,12 @@ module Pod ...@@ -58,12 +58,12 @@ module Pod
matches_platform && matches_target matches_platform && matches_target
end end
headers_dir = root.relative_path_from(sandbox.root).dirname headers_dir = root.relative_path_from(sandbox.root).dirname
@search_paths_cache[key] = search_paths.uniq.flat_map do |entry| @search_paths_cache[key] = search_paths.flat_map do |entry|
paths = [] paths = []
paths << "${PODS_ROOT}/#{headers_dir}/#{@relative_path}" if !use_modular_headers || @visibility_scope == :public paths << "${PODS_ROOT}/#{headers_dir}/#{@relative_path}" if !use_modular_headers || @visibility_scope == :public
paths << "${PODS_ROOT}/#{headers_dir}/#{entry[:path]}" if !use_modular_headers || @visibility_scope == :private paths << "${PODS_ROOT}/#{headers_dir}/#{entry[:path]}" if !use_modular_headers || @visibility_scope == :private
paths paths
end end.uniq
end end
# Removes the directory as it is regenerated from scratch during each # Removes the directory as it is regenerated from scratch during each
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment