| Index: chrome/chrome_common.gypi
|
| diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
|
| index ed15ce29a35d7535c4a7ae2bb4865cf27242e28e..15a2ed5457f85fe337e555c791410cd0f02284eb 100644
|
| --- a/chrome/chrome_common.gypi
|
| +++ b/chrome/chrome_common.gypi
|
| @@ -25,31 +25,31 @@
|
| # TODO(gregoryd): chrome_resources and chrome_strings could be
|
| # shared with the 64-bit target, but it does not work due to a gyp
|
| # issue.
|
| - 'app/policy/cloud_policy_codegen.gyp:policy',
|
| - 'chrome_resources.gyp:chrome_resources',
|
| - 'chrome_resources.gyp:chrome_strings',
|
| - 'chrome_resources.gyp:theme_resources',
|
| 'common_constants',
|
| 'common_net',
|
| 'common_version',
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_i18n',
|
| - '../base/base.gyp:base_static',
|
| - '../build/temp_gyp/googleurl.gyp:googleurl',
|
| - '../content/content.gyp:content_common',
|
| - '../ipc/ipc.gyp:ipc',
|
| - '../net/net.gyp:net',
|
| - '../printing/printing.gyp:printing',
|
| - '../skia/skia.gyp:skia',
|
| - '../third_party/bzip2/bzip2.gyp:bzip2',
|
| - '../third_party/icu/icu.gyp:icui18n',
|
| - '../third_party/icu/icu.gyp:icuuc',
|
| - '../third_party/libxml/libxml.gyp:libxml',
|
| - '../third_party/sqlite/sqlite.gyp:sqlite',
|
| - '../third_party/zlib/zlib.gyp:zlib',
|
| - '../ui/ui.gyp:ui_resources',
|
| - '../ui/ui.gyp:ui_resources_standard',
|
| - '../webkit/support/webkit_support.gyp:glue',
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/base/base.gyp:base_i18n',
|
| + '<(DEPTH)/base/base.gyp:base_static',
|
| + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
|
| + '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
|
| + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
|
| + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
|
| + '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
|
| + '<(DEPTH)/content/content.gyp:content_common',
|
| + '<(DEPTH)/ipc/ipc.gyp:ipc',
|
| + '<(DEPTH)/net/net.gyp:net',
|
| + '<(DEPTH)/printing/printing.gyp:printing',
|
| + '<(DEPTH)/skia/skia.gyp:skia',
|
| + '<(DEPTH)/third_party/bzip2/bzip2.gyp:bzip2',
|
| + '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
|
| + '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
|
| + '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
|
| + '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
|
| + '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
|
| + '<(DEPTH)/ui/ui.gyp:ui_resources',
|
| + '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
|
| + '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
|
| ],
|
| 'sources': [
|
| 'common/about_handler.cc',
|
| @@ -251,7 +251,7 @@
|
| }],
|
| ['OS=="win" and use_aura==0', {
|
| 'dependencies': [
|
| - 'default_plugin/default_plugin.gyp:default_plugin',
|
| + '<(DEPTH)/chrome/default_plugin/default_plugin.gyp:default_plugin',
|
| ]
|
| }],
|
| ['toolkit_uses_gtk == 1', {
|
| @@ -384,15 +384,15 @@
|
| 'common/net/x509_certificate_model.h',
|
| ],
|
| 'dependencies': [
|
| - 'chrome_resources.gyp:chrome_resources',
|
| - 'chrome_resources.gyp:chrome_strings',
|
| - '../base/base.gyp:base',
|
| - '../crypto/crypto.gyp:crypto',
|
| - '../gpu/gpu.gyp:gpu_ipc',
|
| - '../net/net.gyp:net_resources',
|
| - '../net/net.gyp:net',
|
| - '../third_party/icu/icu.gyp:icui18n',
|
| - '../third_party/icu/icu.gyp:icuuc',
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
|
| + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
|
| + '<(DEPTH)/crypto/crypto.gyp:crypto',
|
| + '<(DEPTH)/gpu/gpu.gyp:gpu_ipc',
|
| + '<(DEPTH)/net/net.gyp:net_resources',
|
| + '<(DEPTH)/net/net.gyp:net',
|
| + '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
|
| + '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
|
| ],
|
| 'conditions': [
|
| ['os_posix == 1 and OS != "mac"', {
|
|
|