| Index: chrome/chrome_common.gypi
|
| diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
|
| index 1d3b44ec1e7b13fa62166fc785b9a1d828a1bd19..f3b57632ebda3ae0063dfd61b1c7de9c7a314e3b 100644
|
| --- a/chrome/chrome_common.gypi
|
| +++ b/chrome/chrome_common.gypi
|
| @@ -125,7 +125,6 @@
|
| 'common/chrome_notification_types.h',
|
| 'common/chrome_result_codes.h',
|
| 'common/chrome_process_type.h',
|
| - 'common/chrome_sandbox_type_mac.h',
|
| 'common/chrome_utility_messages.h',
|
| 'common/chrome_version_info.cc',
|
| 'common/chrome_version_info_android.cc',
|
| @@ -373,12 +372,6 @@
|
| 'common/multi_process_lock_linux.cc',
|
| 'common/multi_process_lock_mac.cc',
|
| 'common/multi_process_lock_win.cc',
|
| - 'common/nacl_cmd_line.cc',
|
| - 'common/nacl_cmd_line.h',
|
| - 'common/nacl_messages.cc',
|
| - 'common/nacl_messages.h',
|
| - 'common/nacl_types.cc',
|
| - 'common/nacl_types.h',
|
| 'common/omaha_query_params/omaha_query_params.cc',
|
| 'common/omaha_query_params/omaha_query_params.h',
|
| 'common/omnibox_focus_state.h',
|
| @@ -443,6 +436,12 @@
|
| 'common/web_resource/web_resource_unpacker.h',
|
| 'common/worker_thread_ticker.cc',
|
| 'common/worker_thread_ticker.h',
|
| + '../components/nacl/common/nacl_cmd_line.cc',
|
| + '../components/nacl/common/nacl_cmd_line.h',
|
| + '../components/nacl/common/nacl_messages.cc',
|
| + '../components/nacl/common/nacl_messages.h',
|
| + '../components/nacl/common/nacl_types.cc',
|
| + '../components/nacl/common/nacl_types.h',
|
| ],
|
| 'conditions': [
|
| ['enable_extensions==1', {
|
| @@ -498,13 +497,13 @@
|
| ['exclude', '^common/external_ipc_fuzzer\\.'],
|
| ['exclude', '^common/logging_chrome\\.'],
|
| ['exclude', '^common/multi_process_'],
|
| - ['exclude', '^common/nacl_'],
|
| ['exclude', '^common/pepper_flash\\.'],
|
| ['exclude', '^common/profiling\\.'],
|
| ['exclude', '^common/service_process_util_'],
|
| ['exclude', '^common/spellcheck_'],
|
| ['exclude', '^common/validation_message_'],
|
| ['exclude', '^common/web_apps\\.'],
|
| + ['exclude', '^../components/nacl/common/nacl_'],
|
| # TODO(ios): Include files here as they are made to work; once
|
| # everything is online, remove everything below here and just
|
| # use the exclusions above.
|
|
|