From 2bd2007fb975fe50f3196287cec38fffde378589 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 22 May 2012 18:33:20 +0000 Subject: [PATCH] Update tools_gyp.patch. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@641 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- patch/patches/tools_gyp.patch | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/patch/patches/tools_gyp.patch b/patch/patches/tools_gyp.patch index d2610ae75..ec3a14fff 100644 --- a/patch/patches/tools_gyp.patch +++ b/patch/patches/tools_gyp.patch @@ -1,6 +1,6 @@ Index: pylib/gyp/input.py =================================================================== ---- pylib/gyp/input.py (revision 1323) +--- pylib/gyp/input.py (revision 1185) +++ pylib/gyp/input.py (working copy) @@ -666,7 +666,8 @@ # that don't load quickly, this can be faster than @@ -14,23 +14,23 @@ Index: pylib/gyp/input.py py_module = __import__(parsed_contents[0]) Index: pylib/gyp/mac_tool.py =================================================================== ---- pylib/gyp/mac_tool.py (revision 1323) +--- pylib/gyp/mac_tool.py (revision 1185) +++ pylib/gyp/mac_tool.py (working copy) -@@ -54,16 +54,8 @@ - return self._CopyXIBFile(source, dest) - elif extension == '.strings': - self._CopyStringsFile(source, dest) -- # TODO: Given that files with arbitrary extensions can be copied to the -- # bundle, we will want to get rid of this whitelist eventually. -- elif extension in [ -- '.icns', '.manifest', '.pak', '.pdf', '.png', '.sb', '.sh', -- '.ttf', '.sdef']: -- shutil.copyfile(source, dest) - else: -- raise NotImplementedError( -- "Don't know how to copy bundle resources of type %s while copying " -- "%s to %s)" % (extension, source, dest)) -+ shutil.copyfile(source, dest) - - def _CopyXIBFile(self, source, dest): - """Compiles a XIB file with ibtool into a binary plist in the bundle.""" +@@ -141,16 +141,8 @@ + self._CopyXIBFile(source, dest) + elif extension == '.strings': + self._CopyStringsFile(source, dest) +- # TODO: Given that files with arbitrary extensions can be copied to the +- # bundle, we will want to get rid of this whitelist eventually. +- elif extension in [ +- '.icns', '.manifest', '.pak', '.pdf', '.png', '.sb', '.sh', +- '.ttf', '.sdef']: +- shutil.copyfile(source, dest) + else: +- raise NotImplementedError( +- "Don't know how to copy bundle resources of type %s while copying " +- "%s to %s)" % (extension, source, dest)) ++ shutil.copyfile(source, dest) + + def _CopyXIBFile(self, source, dest): + """Compiles a XIB file with ibtool into a binary plist in the bundle."""