Don't inherit source sets across static libs in GN.

tools/gn/target.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/target.h"
 
 #include "base/bind.h"
 #include "tools/gn/config_values_extractors.h"
 #include "tools/gn/scheduler.h"
 
@@ skipping 159 matching lines @@
         dep->output_type() == SHARED_LIBRARY ||
         dep->output_type() == SOURCE_SET)
       inherited_libraries_.insert(dep);
 
     // Inherited libraries and flags are inherited across static library
     // boundaries.
     if (dep->output_type() != SHARED_LIBRARY &&
         dep->output_type() != EXECUTABLE) {
       const std::set<const Target*> inherited = dep->inherited_libraries();
       for (std::set<const Target*>::const_iterator i = inherited.begin();
-           i != inherited.end(); ++i)
-        inherited_libraries_.insert(*i);
+           i != inherited.end(); ++i) {
+        // Don't copy source sets across static library boundaries. The static
+        // library will include all the files from the source set.
+        if (!(dep->output_type() == STATIC_LIBRARY &&
+              (*i)->output_type() == SOURCE_SET))
+          inherited_libraries_.insert(*i);
+      }
 
       // Inherited library settings.
       all_lib_dirs_.append(dep->all_lib_dirs());
       all_libs_.append(dep->all_libs());
     }
   }
 }
 
 void Target::PullForwardedDependentConfigs() {
   // Groups implicitly forward all if its dependency's configs.
@@ skipping 24 matching lines @@
 
     // Android STL doesn't like insert(begin, end) so do it manually.
     // TODO(brettw) this can be changed to insert(dep->begin(), dep->end()) when
     // Android uses a better STL.
     for (std::set<const Target*>::const_iterator cur =
              dep->recursive_hard_deps().begin();
          cur != dep->recursive_hard_deps().end(); ++cur)
       recursive_hard_deps_.insert(*cur);
   }
 }