| Index: chrome/chrome_exe.gypi
|
| ===================================================================
|
| --- chrome/chrome_exe.gypi (revision 98424)
|
| +++ chrome/chrome_exe.gypi (working copy)
|
| @@ -182,6 +182,7 @@
|
| # Needed for chrome_main.cc initialization of libraries.
|
| '../build/linux/system.gyp:dbus-glib',
|
| '../build/linux/system.gyp:gtk',
|
| + 'packed_resources',
|
| # Needed to use the master_preferences functions
|
| 'installer_util',
|
| ],
|
| @@ -442,7 +443,6 @@
|
| ],
|
| 'dependencies': [
|
| 'packed_extra_resources',
|
| - 'packed_resources',
|
| # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
|
| # file decide what to do on a per-OS basis; on Mac, internal plugins
|
| # go inside the framework, so this dependency is in chrome_dll.gypi.
|
| @@ -479,6 +479,7 @@
|
| '../breakpad/breakpad.gyp:breakpad_handler',
|
| '../breakpad/breakpad.gyp:breakpad_sender',
|
| '../sandbox/sandbox.gyp:sandbox',
|
| + 'app/locales/locales.gyp:*',
|
| 'app/policy/cloud_policy_codegen.gyp:policy',
|
| ],
|
| 'sources': [
|
|
|
| Property changes on: chrome/chrome_exe.gypi
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|