Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: pylib/gyp/xcodeproj_file.py

Issue 748793002: Fixed Gyp Xcode generator for libraries with identical names. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pylib/gyp/xcodeproj_file.py
diff --git a/pylib/gyp/xcodeproj_file.py b/pylib/gyp/xcodeproj_file.py
index a9deb1549e086c5166bac32b986c5d0a500ad806..702e773ce2ed4438bdec215e88c6d8be2fd71967 100644
--- a/pylib/gyp/xcodeproj_file.py
+++ b/pylib/gyp/xcodeproj_file.py
@@ -2808,6 +2808,16 @@ class PBXProject(XCContainerPortal):
product_group._properties['children'],
cmp=lambda x, y, rp=remote_products: CompareProducts(x, y, rp))
+ def Hashables(self):
+ # super
+ hashables = XCObject.Hashables(self)
+
+ # Projects (.xcodeproj) files with identical names defining products with
+ # identical names cause a false positive hash ID collision. We add the
+ # project file's path to the hashables to avoid this.
+ hashables.extend([self._properties['projectRoot']])
+ return hashables
+
class XCProjectFile(XCObject):
_schema = XCObject._schema.copy()

Powered by Google App Engine
This is Rietveld 408576698