| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 27226)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -393,11 +393,37 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'common_constants',
|
| + 'type': '<(library)',
|
| + 'dependencies': [
|
| + '../base/base.gyp:base',
|
| + ],
|
| + 'sources': [
|
| + 'common/chrome_constants.cc',
|
| + 'common/chrome_constants.h',
|
| + 'common/chrome_paths.cc',
|
| + 'common/chrome_paths.h',
|
| + 'common/chrome_paths_internal.h',
|
| + 'common/chrome_paths_linux.cc',
|
| + 'common/chrome_paths_mac.mm',
|
| + 'common/chrome_paths_win.cc',
|
| + 'common/chrome_switches.cc',
|
| + 'common/chrome_switches.h',
|
| + 'common/env_vars.cc',
|
| + 'common/env_vars.h',
|
| + 'common/json_value_serializer.cc',
|
| + 'common/json_value_serializer.h',
|
| + 'common/pref_names.cc',
|
| + 'common/pref_names.h',
|
| + ],
|
| + },
|
| {
|
| 'target_name': 'common',
|
| 'type': '<(library)',
|
| 'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146',
|
| 'dependencies': [
|
| + 'common_constants',
|
| 'chrome_resources',
|
| 'chrome_strings',
|
| 'theme_resources',
|
| @@ -471,24 +497,14 @@
|
| 'common/child_process_logging_win.cc',
|
| 'common/child_thread.cc',
|
| 'common/child_thread.h',
|
| - 'common/chrome_constants.cc',
|
| - 'common/chrome_constants.h',
|
| 'common/chrome_counters.cc',
|
| 'common/chrome_counters.h',
|
| 'common/chrome_descriptors.h',
|
| - 'common/chrome_paths.cc',
|
| - 'common/chrome_paths.h',
|
| - 'common/chrome_paths_internal.h',
|
| - 'common/chrome_paths_linux.cc',
|
| - 'common/chrome_paths_mac.mm',
|
| - 'common/chrome_paths_win.cc',
|
| 'common/chrome_plugin_api.h',
|
| 'common/chrome_plugin_lib.cc',
|
| 'common/chrome_plugin_lib.h',
|
| 'common/chrome_plugin_util.cc',
|
| 'common/chrome_plugin_util.h',
|
| - 'common/chrome_switches.cc',
|
| - 'common/chrome_switches.h',
|
| 'common/classfactory.cc',
|
| 'common/classfactory.h',
|
| 'common/common_glue.cc',
|
| @@ -502,8 +518,6 @@
|
| 'common/devtools_messages.h',
|
| 'common/devtools_messages_internal.h',
|
| 'common/dom_storage_type.h',
|
| - 'common/env_vars.cc',
|
| - 'common/env_vars.h',
|
| 'common/filter_policy.h',
|
| 'common/gears_api.h',
|
| 'common/gtk_tree.cc',
|
| @@ -514,8 +528,6 @@
|
| 'common/histogram_synchronizer.h',
|
| 'common/important_file_writer.cc',
|
| 'common/important_file_writer.h',
|
| - 'common/json_value_serializer.cc',
|
| - 'common/json_value_serializer.h',
|
| 'common/jstemplate_builder.cc',
|
| 'common/jstemplate_builder.h',
|
| 'common/libxml_utils.cc',
|
| @@ -558,8 +570,6 @@
|
| 'common/plugin_messages_internal.h',
|
| 'common/pref_member.cc',
|
| 'common/pref_member.h',
|
| - 'common/pref_names.cc',
|
| - 'common/pref_names.h',
|
| 'common/pref_service.cc',
|
| 'common/pref_service.h',
|
| 'common/process_watcher_posix.cc',
|
| @@ -3475,14 +3485,11 @@
|
| }],
|
| ['OS=="win"', {
|
| 'dependencies': [
|
| - '../app/app.gyp:app_id',
|
| 'installer/installer.gyp:installer_util',
|
| 'installer/installer.gyp:installer_util_strings',
|
| '../breakpad/breakpad.gyp:breakpad_handler',
|
| '../breakpad/breakpad.gyp:breakpad_sender',
|
| '../sandbox/sandbox.gyp:sandbox',
|
| - '../views/views.gyp:views',
|
| - 'worker',
|
| 'app/locales/locales.gyp:*',
|
| ],
|
| 'sources': [
|
| @@ -3717,8 +3724,6 @@
|
| 'test/chrome_process_util_linux.cc',
|
| 'test/chrome_process_util_mac.cc',
|
| 'test/chrome_process_util_win.cc',
|
| - 'test/in_process_browser_test.cc',
|
| - 'test/in_process_browser_test.h',
|
| 'test/perf/mem_usage_linux.cc',
|
| 'test/perf/mem_usage_mac.cc',
|
| 'test/perf/mem_usage_win.cc',
|
| @@ -5359,6 +5364,8 @@
|
| 'browser/blocked_popup_container_interactive_uitest.cc',
|
| 'browser/views/find_bar_host_interactive_uitest.cc',
|
| 'browser/views/tabs/tab_dragging_test.cc',
|
| + 'test/in_process_browser_test.cc',
|
| + 'test/in_process_browser_test.h',
|
| 'test/interactive_ui/npapi_interactive_test.cc',
|
| 'test/interactive_ui/view_event_test_base.cc',
|
| 'test/interactive_ui/view_event_test_base.h',
|
| @@ -5542,6 +5549,8 @@
|
| ],
|
| 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
|
| 'sources': [
|
| + 'test/in_process_browser_test.cc',
|
| + 'test/in_process_browser_test.h',
|
| 'test/test_launcher/out_of_proc_test_runner.cc',
|
| 'test/test_launcher/test_runner.cc',
|
| 'test/test_launcher/test_runner.h',
|
| @@ -5749,28 +5758,30 @@
|
| # TODO(phajdan.jr): Only temporary, to make transition easier.
|
| 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
|
| 'sources': [
|
| + 'app/chrome_dll.rc',
|
| + 'app/chrome_dll_resource.h',
|
| + 'app/chrome_dll_version.rc.version',
|
| + 'test/in_process_browser_test.cc',
|
| + 'test/in_process_browser_test.h',
|
| 'test/live_sync/bookmark_model_verifier.cc',
|
| 'test/live_sync/bookmark_model_verifier.h',
|
| 'test/live_sync/live_bookmarks_sync_test.cc',
|
| 'test/live_sync/live_bookmarks_sync_test.h',
|
| 'test/live_sync/profile_sync_service_test_harness.cc',
|
| 'test/live_sync/profile_sync_service_test_harness.h',
|
| + 'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
|
| + 'test/live_sync/two_client_live_bookmarks_sync_test.cc',
|
| 'test/test_launcher/run_all_unittests.cc',
|
| 'test/test_notification_tracker.cc',
|
| 'test/test_notification_tracker.h',
|
| 'test/testing_browser_process.h',
|
| 'test/ui_test_utils.cc',
|
| 'test/ui_test_utils.h',
|
| - 'app/chrome_dll.rc',
|
| - 'app/chrome_dll_resource.h',
|
| - 'app/chrome_dll_version.rc.version',
|
| 'test/data/resource.h',
|
| 'test/data/resource.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| - 'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
|
| - 'test/live_sync/two_client_live_bookmarks_sync_test.cc',
|
| ],
|
| 'conditions': [
|
| # Plugin code.
|
|
|