Revert "Merge pull request #7451 from CocoaPods/seg-revert-7442"

This reverts commit 636d1104, reversing
changes made to b6309bbd.

# Conflicts:
#	lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
#	lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
#	spec/unit/installer/xcode/pods_project_generator/file_references_installer_spec.rb
#	spec/unit/target/build_settings/pod_target_settings_spec.rb

CHANGELOG.md

@@ -59,6 +59,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Maxime Le Moine](https://github.com/MaximeLM)
   [#7590](https://github.com/CocoaPods/CocoaPods/issues/7590)
 
+* When integrating a vendored framework while building pods as static 
+  libraries, public headers will be found via `FRAMEWORK_SEARCH_PATHS` 
+  instead of via the sandbox headers store.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 1.5.0 (2018-04-04)
 
 ##### Enhancements

lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb

@@ -158,13 +158,6 @@ module Pod
                     added_public_headers = true
                     sandbox.public_headers.add_files(namespaced_path, files)
                   end
-
-                  unless pod_target.requires_frameworks?
-                    vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
-                      added_public_headers = true
-                      sandbox.public_headers.add_files(namespaced_path, files)
-                    end
-                  end
                 end
 
                 pod_target.build_headers.add_search_path(headers_sandbox, pod_target.platform) if added_build_headers
@@ -332,36 +325,6 @@ module Pod
             mappings
           end
 
-          # Computes the destination sub-directory in the sandbox for headers
-          # from inside vendored frameworks.
-          #
-          # @param  [Pathname] headers_sandbox
-          #         The sandbox where the header links should be stored for this
-          #         Pod.
-          #
-          # @param  [Sandbox::FileAccessor] file_accessor
-          #         The consumer file accessor for which the headers need to be
-          #         linked.
-          #
-          def vendored_frameworks_header_mappings(headers_sandbox, file_accessor)
-            mappings = {}
-            file_accessor.vendored_frameworks.each do |framework|
-              headers_dir = Sandbox::FileAccessor.vendored_frameworks_headers_dir(framework)
-              headers = Sandbox::FileAccessor.vendored_frameworks_headers(framework)
-              framework_name = framework.basename(framework.extname)
-              dir = headers_sandbox + framework_name
-              headers.each do |header|
-                # the relative path of framework headers should be kept,
-                # not flattened like is done for most public headers.
-                relative_path = header.relative_path_from(headers_dir)
-                sub_dir = dir + relative_path.dirname
-                mappings[sub_dir] ||= []
-                mappings[sub_dir] << header
-              end
-            end
-            mappings
-          end
-
           #-----------------------------------------------------------------------#
         end
       end

spec/unit/installer/xcode/pods_project_generator/file_references_installer_spec.rb

@@ -90,12 +90,8 @@ module Pod
               framework_subdir_header = headers_root + 'BananaLib/Bananalib/SubDir/SubBananalib.h'
               public_headers.each { |public_header| public_header.should.exist }
               private_header.should.not.exist
-              framework_header.should.exist
-              framework_subdir_header.should.exist
-              config.sandbox.public_headers.search_paths(@pod_target.platform).should == %w(
-                ${PODS_ROOT}/Headers/Public
-                ${PODS_ROOT}/Headers/Public/BananaLib
-              )
+              framework_header.should.not.exist
+              framework_subdir_header.should.not.exist
             end
 
             it 'links the public headers meant for the user for a vendored framework' do