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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 8430011: Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « chrome/nacl.gypi ('k') | ui/aura/aura.gyp » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 9 'variables': {
10 'version_py_path': '../tools/build/version.py', 10 'version_py_path': '../tools/build/version.py',
(...skipping 16 matching lines...) Expand all
27 'python' 27 'python'
28 ], 28 ],
29 }], 29 }],
30 ], 30 ],
31 }, 31 },
32 'includes': [ 32 'includes': [
33 '../build/win_precompile.gypi', 33 '../build/win_precompile.gypi',
34 ], 34 ],
35 'target_defaults': { 35 'target_defaults': {
36 'dependencies': [ 36 'dependencies': [
37 '../chrome/chrome_resources.gyp:chrome_resources', 37 '../chrome/chrome.gyp:chrome_resources',
38 '../chrome/chrome_resources.gyp:chrome_strings', 38 '../chrome/chrome.gyp:chrome_strings',
39 '../chrome/chrome_resources.gyp:packed_resources', 39 '../chrome/chrome.gyp:packed_resources',
40 '../chrome/chrome_resources.gyp:theme_resources', 40 '../chrome/chrome.gyp:theme_resources',
41 '../skia/skia.gyp:skia', 41 '../skia/skia.gyp:skia',
42 ], 42 ],
43 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], 43 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
44 'include_dirs': [ 44 'include_dirs': [
45 # all our own includes are relative to src/ 45 # all our own includes are relative to src/
46 '..', 46 '..',
47 ], 47 ],
48 }, 48 },
49 'targets': [ 49 'targets': [
50 { 50 {
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 }], 369 }],
370 ], 370 ],
371 }, 371 },
372 372
373 { 373 {
374 'target_name': 'chrome_frame_net_tests', 374 'target_name': 'chrome_frame_net_tests',
375 'type': 'executable', 375 'type': 'executable',
376 'dependencies': [ 376 'dependencies': [
377 '../base/base.gyp:test_support_base', 377 '../base/base.gyp:test_support_base',
378 '../chrome/chrome.gyp:browser', 378 '../chrome/chrome.gyp:browser',
379 '../chrome/chrome.gyp:chrome_resources',
379 '../chrome/chrome.gyp:debugger', 380 '../chrome/chrome.gyp:debugger',
380 '../chrome/chrome.gyp:renderer', 381 '../chrome/chrome.gyp:renderer',
381 '../chrome/chrome.gyp:syncapi_core', 382 '../chrome/chrome.gyp:syncapi_core',
382 '../chrome/chrome_resources.gyp:chrome_resources',
383 '../content/content.gyp:content_gpu', 383 '../content/content.gyp:content_gpu',
384 '../net/net.gyp:net', 384 '../net/net.gyp:net',
385 '../net/net.gyp:net_test_support', 385 '../net/net.gyp:net_test_support',
386 '../skia/skia.gyp:skia', 386 '../skia/skia.gyp:skia',
387 '../testing/gtest.gyp:gtest', 387 '../testing/gtest.gyp:gtest',
388 '../third_party/icu/icu.gyp:icui18n', 388 '../third_party/icu/icu.gyp:icui18n',
389 '../third_party/icu/icu.gyp:icuuc', 389 '../third_party/icu/icu.gyp:icuuc',
390 '../ui/ui.gyp:ui_resources', 390 '../ui/ui.gyp:ui_resources',
391 'chrome_frame_ie', 391 'chrome_frame_ie',
392 'chrome_tab_idl', 392 'chrome_tab_idl',
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 # Use outputs of this action as inputs for the main target build. 1040 # Use outputs of this action as inputs for the main target build.
1041 # Seems as a misnomer but makes this happy on Linux (scons). 1041 # Seems as a misnomer but makes this happy on Linux (scons).
1042 'process_outputs_as_sources': 1, 1042 'process_outputs_as_sources': 1,
1043 }, 1043 },
1044 ], 1044 ],
1045 }, 1045 },
1046 ], 1046 ],
1047 }, ], # 'coverage!=0' 1047 }, ], # 'coverage!=0'
1048 ], # 'conditions' 1048 ], # 'conditions'
1049 } 1049 }
OLDNEW
« no previous file with comments | « chrome/nacl.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698