Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: chrome/chrome.gyp

Issue 56119: Fix Mac build breakz (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 ], 1351 ],
1352 }], 1352 }],
1353 ], 1353 ],
1354 }, 1354 },
1355 { 1355 {
1356 'target_name': 'renderer', 1356 'target_name': 'renderer',
1357 'type': 'static_library', 1357 'type': 'static_library',
1358 'dependencies': [ 1358 'dependencies': [
1359 'common', 1359 'common',
1360 'resources', 1360 'resources',
1361 '../printing/printing.gyp:printing',
1361 '../skia/skia.gyp:skia', 1362 '../skia/skia.gyp:skia',
1362 '../third_party/icu38/icu38.gyp:icui18n', 1363 '../third_party/icu38/icu38.gyp:icui18n',
1363 '../third_party/icu38/icu38.gyp:icuuc', 1364 '../third_party/icu38/icu38.gyp:icuuc',
1364 '../third_party/npapi/npapi.gyp:npapi', 1365 '../third_party/npapi/npapi.gyp:npapi',
1365 '../webkit/webkit.gyp:glue', 1366 '../webkit/webkit.gyp:glue',
1366 '../webkit/webkit.gyp:webkit', 1367 '../webkit/webkit.gyp:webkit',
1367 ], 1368 ],
1368 'include_dirs': [ 1369 'include_dirs': [
1369 '..', 1370 '..',
1370 ], 1371 ],
1371 'sources': [ 1372 'sources': [
1372 # All .cc, .h, and .mm files under renderer except tests and mocks. 1373 » # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
1374 » # But app/ is the wrong directory for them.
1375 » # Better is to remove the dep of *_tests on renderer, but in the
1376 » # short term I'd like the build to work.
1377 'app/breakpad_win.cc',
1378 'app/breakpad_win.h',
1379 'app/breakpad_mac.mm',
1380 'app/breakpad_mac.h',
1373 'renderer/automation/dom_automation_controller.cc', 1381 'renderer/automation/dom_automation_controller.cc',
1374 'renderer/automation/dom_automation_controller.h', 1382 'renderer/automation/dom_automation_controller.h',
1375 'renderer/extensions/extension_process_bindings.cc', 1383 'renderer/extensions/extension_process_bindings.cc',
1376 'renderer/extensions/extension_process_bindings.h', 1384 'renderer/extensions/extension_process_bindings.h',
1377 'renderer/extensions/renderer_extension_bindings.cc', 1385 'renderer/extensions/renderer_extension_bindings.cc',
1378 'renderer/extensions/renderer_extension_bindings.h', 1386 'renderer/extensions/renderer_extension_bindings.h',
1379 'renderer/media/audio_renderer_impl.cc', 1387 'renderer/media/audio_renderer_impl.cc',
1380 'renderer/media/audio_renderer_impl.h', 1388 'renderer/media/audio_renderer_impl.h',
1381 'renderer/media/data_source_impl.cc', 1389 'renderer/media/data_source_impl.cc',
1382 'renderer/media/data_source_impl.h', 1390 'renderer/media/data_source_impl.h',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 'type': 'executable', 1481 'type': 'executable',
1474 'mac_bundle': 1, 1482 'mac_bundle': 1,
1475 'dependencies': [ 1483 'dependencies': [
1476 'common', 1484 'common',
1477 'browser', 1485 'browser',
1478 'renderer', 1486 'renderer',
1479 '../printing/printing.gyp:printing', 1487 '../printing/printing.gyp:printing',
1480 ], 1488 ],
1481 'sources': [ 1489 'sources': [
1482 # All .cc, .h, .m, and .mm files under app except for tests. 1490 # All .cc, .h, .m, and .mm files under app except for tests.
1483 'app/breakpad_win.cc',
1484 'app/breakpad_win.h',
1485 'app/breakpad_mac.mm',
1486 'app/breakpad_mac.h',
1487 'app/chrome_dll_main.cc', 1491 'app/chrome_dll_main.cc',
1488 'app/chrome_dll_resource.h', 1492 'app/chrome_dll_resource.h',
1489 'app/chrome_exe_main.cc', 1493 'app/chrome_exe_main.cc',
1490 'app/chrome_exe_main.mm', 1494 'app/chrome_exe_main.mm',
1491 'app/chrome_exe_main_gtk.cc', 1495 'app/chrome_exe_main_gtk.cc',
1492 'app/chrome_exe_resource.h', 1496 'app/chrome_exe_resource.h',
1493 'app/client_util.cc', 1497 'app/client_util.cc',
1494 'app/client_util.h', 1498 'app/client_util.h',
1495 'app/google_update_client.cc', 1499 'app/google_update_client.cc',
1496 'app/google_update_client.h', 1500 'app/google_update_client.h',
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 # gtk/gtk.h 1826 # gtk/gtk.h
1823 '../build/linux/system.gyp:gtk', 1827 '../build/linux/system.gyp:gtk',
1824 ], 1828 ],
1825 }], 1829 }],
1826 ], 1830 ],
1827 }, 1831 },
1828 { 1832 {
1829 'target_name': 'ipc_tests', 1833 'target_name': 'ipc_tests',
1830 'type': 'executable', 1834 'type': 'executable',
1831 'dependencies': [ 1835 'dependencies': [
1836 'browser',
1832 'common', 1837 'common',
1838 'renderer',
1833 'test_support_unit', 1839 'test_support_unit',
1834 '../base/base.gyp:base', 1840 '../base/base.gyp:base',
1835 '../testing/gtest.gyp:gtest', 1841 '../testing/gtest.gyp:gtest',
1836 ], 1842 ],
1837 'sources': [ 1843 'sources': [
1838 'common/ipc_fuzzing_tests.cc', 1844 'common/ipc_fuzzing_tests.cc',
1839 'common/ipc_message_unittest.cc', 1845 'common/ipc_message_unittest.cc',
1840 'common/ipc_send_fds_test.cc', 1846 'common/ipc_send_fds_test.cc',
1841 'common/ipc_sync_channel_unittest.cc', 1847 'common/ipc_sync_channel_unittest.cc',
1842 'common/ipc_sync_message_unittest.cc', 1848 'common/ipc_sync_message_unittest.cc',
1843 'common/ipc_sync_message_unittest.h', 1849 'common/ipc_sync_message_unittest.h',
1844 'common/ipc_tests.cc', 1850 'common/ipc_tests.cc',
1845 'common/ipc_tests.h', 1851 'common/ipc_tests.h',
1846 ], 1852 ],
1847 'conditions': [ 1853 'conditions': [
1848 ['OS=="linux"', { 1854 ['OS=="linux"', {
1849 'dependencies': [ 1855 'dependencies': [
1850 '../build/linux/system.gyp:gtk', 1856 '../build/linux/system.gyp:gtk',
1851 ], 1857 ],
1852 }], 1858 }],
1853 ], 1859 ],
1854 }, 1860 },
1855 { 1861 {
1856 'target_name': 'ui_tests', 1862 'target_name': 'ui_tests',
1857 'type': 'executable', 1863 'type': 'executable',
1858 'dependencies': [ 1864 'dependencies': [
1859 'app', 1865 'app',
1860 'browser', 1866 'browser',
1861 'common', 1867 'common',
1868 'renderer',
1862 'resources', 1869 'resources',
1863 'test_support_ui', 1870 'test_support_ui',
1864 '../base/base.gyp:base', 1871 '../base/base.gyp:base',
1865 '../net/net.gyp:net', 1872 '../net/net.gyp:net',
1866 '../build/temp_gyp/googleurl.gyp:googleurl', 1873 '../build/temp_gyp/googleurl.gyp:googleurl',
1867 '../skia/skia.gyp:skia', 1874 '../skia/skia.gyp:skia',
1868 '../testing/gtest.gyp:gtest', 1875 '../testing/gtest.gyp:gtest',
1869 '../third_party/icu38/icu38.gyp:icui18n', 1876 '../third_party/icu38/icu38.gyp:icui18n',
1870 '../third_party/icu38/icu38.gyp:icuuc', 1877 '../third_party/icu38/icu38.gyp:icuuc',
1871 '../third_party/libxml/libxml.gyp:libxml', 1878 '../third_party/libxml/libxml.gyp:libxml',
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
2262 }], 2269 }],
2263 ], 2270 ],
2264 }, 2271 },
2265 { 2272 {
2266 'target_name': 'startup_tests', 2273 'target_name': 'startup_tests',
2267 'type': 'executable', 2274 'type': 'executable',
2268 'dependencies': [ 2275 'dependencies': [
2269 'app', 2276 'app',
2270 'browser', 2277 'browser',
2271 'common', 2278 'common',
2279 'renderer',
2272 'resources', 2280 'resources',
2273 'test_support_ui', 2281 'test_support_ui',
2274 '../base/base.gyp:base', 2282 '../base/base.gyp:base',
2275 '../skia/skia.gyp:skia', 2283 '../skia/skia.gyp:skia',
2276 '../testing/gtest.gyp:gtest', 2284 '../testing/gtest.gyp:gtest',
2277 ], 2285 ],
2278 'sources': [ 2286 'sources': [
2279 'test/startup/feature_startup_test.cc', 2287 'test/startup/feature_startup_test.cc',
2280 'test/startup/startup_test.cc', 2288 'test/startup/startup_test.cc',
2281 'tools/build/win/precompiled.cc', 2289 'tools/build/win/precompiled.cc',
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
2765 'Debug': { 2773 'Debug': {
2766 'msvs_precompiled_header': 'tools/build/win/precompiled.h', 2774 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
2767 'msvs_precompiled_source': 'tools/build/win/precompiled.cc', 2775 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
2768 }, 2776 },
2769 }, 2777 },
2770 }, 2778 },
2771 ]}, # 'targets' 2779 ]}, # 'targets'
2772 ], # OS=="win" 2780 ], # OS=="win"
2773 ], # 'conditions' 2781 ], # 'conditions'
2774 } 2782 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698