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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 6026010: Autofill heuristics regular expressions should be stored in external data files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 10 years 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/chrome.gyp ('k') | chrome/chrome_tests.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'target_defaults': { 5 'target_defaults': {
6 'variables': { 6 'variables': {
7 'chrome_dll_target': 0, 7 'chrome_dll_target': 0,
8 }, 8 },
9 'target_conditions': [ 9 'target_conditions': [
10 ['chrome_dll_target==1', { 10 ['chrome_dll_target==1', {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 '../webkit/glue/resources/vertical_text.cur', 104 '../webkit/glue/resources/vertical_text.cur',
105 '../webkit/glue/resources/zoom_in.cur', 105 '../webkit/glue/resources/zoom_in.cur',
106 '../webkit/glue/resources/zoom_out.cur', 106 '../webkit/glue/resources/zoom_out.cur',
107 107
108 # TODO: It would be nice to have these pulled in 108 # TODO: It would be nice to have these pulled in
109 # automatically from direct_dependent_settings in 109 # automatically from direct_dependent_settings in
110 # their various targets (net.gyp:net_resources, etc.), 110 # their various targets (net.gyp:net_resources, etc.),
111 # but that causes errors in other targets when 111 # but that causes errors in other targets when
112 # resulting .res files get referenced multiple times. 112 # resulting .res files get referenced multiple times.
113 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 113 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
114 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
114 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 115 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
115 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 116 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
116 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 117 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
117 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 118 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
118 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 119 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
119 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 120 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
120 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 121 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
121 122
122 # TODO(sgk): left-over from pre-gyp build, figure out 123 # TODO(sgk): left-over from pre-gyp build, figure out
123 # if we still need them and/or how to update to gyp. 124 # if we still need them and/or how to update to gyp.
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 ], 320 ],
320 'repack_path': '../tools/data_pack/repack.py', 321 'repack_path': '../tools/data_pack/repack.py',
321 }, 322 },
322 'actions': [ 323 'actions': [
323 # TODO(mark): These actions are duplicated for Linux and 324 # TODO(mark): These actions are duplicated for Linux and
324 # FreeBSD in the chrome target. Can they be unified? 325 # FreeBSD in the chrome target. Can they be unified?
325 { 326 {
326 'action_name': 'repack_chrome', 327 'action_name': 'repack_chrome',
327 'variables': { 328 'variables': {
328 'pak_inputs': [ 329 'pak_inputs': [
330 '<(grit_out_dir)/autofill_resources.pak',
329 '<(grit_out_dir)/browser_resources.pak', 331 '<(grit_out_dir)/browser_resources.pak',
330 '<(grit_out_dir)/common_resources.pak', 332 '<(grit_out_dir)/common_resources.pak',
331 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak', 333 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak',
332 '<(grit_out_dir)/renderer_resources.pak', 334 '<(grit_out_dir)/renderer_resources.pak',
333 '<(grit_out_dir)/theme_resources.pak', 335 '<(grit_out_dir)/theme_resources.pak',
334 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak', 336 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak',
335 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 337 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
336 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak', 338 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak',
337 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 339 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
338 ], 340 ],
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 'browser/renderer_host/render_process_host_dummy.cc', 577 'browser/renderer_host/render_process_host_dummy.cc',
576 'common/googleurl_dummy.cc', 578 'common/googleurl_dummy.cc',
577 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 579 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ',
578 580
579 # TODO: It would be nice to have these pulled in 581 # TODO: It would be nice to have these pulled in
580 # automatically from direct_dependent_settings in 582 # automatically from direct_dependent_settings in
581 # their various targets (net.gyp:net_resources, etc.), 583 # their various targets (net.gyp:net_resources, etc.),
582 # but that causes errors in other targets when 584 # but that causes errors in other targets when
583 # resulting .res files get referenced multiple times. 585 # resulting .res files get referenced multiple times.
584 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 586 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
587 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
585 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 588 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
586 589
587 # TODO(sgk): left-over from pre-gyp build, figure out 590 # TODO(sgk): left-over from pre-gyp build, figure out
588 # if we still need them and/or how to update to gyp. 591 # if we still need them and/or how to update to gyp.
589 #'app/check_dependents.bat', 592 #'app/check_dependents.bat',
590 #'app/chrome.dll.deps', 593 #'app/chrome.dll.deps',
591 594
592 # Stub entry points for process types that are not supported 595 # Stub entry points for process types that are not supported
593 # by NaCl Win64 executable 596 # by NaCl Win64 executable
594 'app/dummy_main_functions.cc', 597 'app/dummy_main_functions.cc',
595 ], 598 ],
596 'msvs_settings': { 599 'msvs_settings': {
597 'VCLinkerTool': { 600 'VCLinkerTool': {
598 'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib', 601 'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib',
599 'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb', 602 'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb',
600 }, 603 },
601 }, 604 },
602 'configurations': { 605 'configurations': {
603 'Common_Base': { 606 'Common_Base': {
604 'msvs_target_platform': 'x64', 607 'msvs_target_platform': 'x64',
605 }, 608 },
606 }, 609 },
607 }, # target chrome_dll 610 }, # target chrome_dll
608 ], 611 ],
609 }], 612 }],
610 ], 613 ],
611 } 614 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698