Commit b8e1f95c authored by mark@chromium.org's avatar mark@chromium.org

Bring the GYP-based build up to the current state of the trunk.

Review URL: http://codereview.chromium.org/27212

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10468 0039d316-1c4b-4281-b951-d872f2087c98
parent 5418f47e
...@@ -316,7 +316,6 @@ ...@@ -316,7 +316,6 @@
{ # else: OS != "linux" { # else: OS != "linux"
'sources!': [ 'sources!': [
'atomicops_internals_x86_gcc.cc', 'atomicops_internals_x86_gcc.cc',
'data_pack.cc',
'hmac_nss.cc', 'hmac_nss.cc',
'idle_timer_none.cc', 'idle_timer_none.cc',
'message_pump_glib.cc', 'message_pump_glib.cc',
...@@ -344,6 +343,7 @@ ...@@ -344,6 +343,7 @@
'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'], 'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'],
['exclude', '\\.mm?$' ] ], ['exclude', '\\.mm?$' ] ],
'sources!': [ 'sources!': [
'data_pack.cc',
'event_recorder_stubs.cc', 'event_recorder_stubs.cc',
'message_pump_libevent.cc', 'message_pump_libevent.cc',
'string16.cc', 'string16.cc',
......
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
'common/resource_bundle.cc', 'common/resource_bundle.cc',
'common/resource_bundle.h', 'common/resource_bundle.h',
'common/resource_bundle_linux.cc', 'common/resource_bundle_linux.cc',
'common/resource_bundle_mac.mm',
'common/resource_bundle_win.cc', 'common/resource_bundle_win.cc',
'common/resource_dispatcher.cc', 'common/resource_dispatcher.cc',
'common/resource_dispatcher.h', 'common/resource_dispatcher.h',
...@@ -1239,6 +1240,12 @@ ...@@ -1239,6 +1240,12 @@
'renderer/chrome_plugin_host.h', 'renderer/chrome_plugin_host.h',
'renderer/debug_message_handler.cc', 'renderer/debug_message_handler.cc',
'renderer/debug_message_handler.h', 'renderer/debug_message_handler.h',
'renderer/dev_tools_agent.cc',
'renderer/dev_tools_agent.h',
'renderer/dev_tools_client.cc',
'renderer/dev_tools_client.h',
'renderer/dev_tools_messages.h',
'renderer/dev_tools_messages_internal.h',
'renderer/dom_ui_bindings.cc', 'renderer/dom_ui_bindings.cc',
'renderer/dom_ui_bindings.h', 'renderer/dom_ui_bindings.h',
'renderer/external_host_bindings.cc', 'renderer/external_host_bindings.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment