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

Side by Side Diff: trunk/src/chrome/chrome_browser_chromeos.gypi

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
11 'variables': { 11 'variables': {
12 'conditions': [ 12 'conditions': [
13 ['sysroot!=""', { 13 ['sysroot!=""', {
14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)"', 14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)"',
15 }, { 15 }, {
16 'pkg-config': 'pkg-config' 16 'pkg-config': 'pkg-config'
17 }], 17 }],
18 ], 18 ],
19 # Override to dynamically link the cras (ChromeOS audio) library. 19 # Override to dynamically link the cras (ChromeOS audio) library.
20 'use_cras%': 0, 20 'use_cras%': 0,
21 'enable_wexit_time_destructors': 1, 21 'enable_wexit_time_destructors': 1,
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 # TODO(tbarzic): Cleanup this list. 24 # TODO(tbarzic): Cleanup this list.
25 'app/policy/cloud_policy_codegen.gyp:policy', 25 'app/policy/cloud_policy_codegen.gyp:policy',
26 'browser_extensions', 26 'browser_extensions',
27 'browser/chromeos/input_method/input_method.gyp:gencode',
27 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ', 28 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ',
28 'cert_logger_proto', 29 'cert_logger_proto',
29 'chrome_resources.gyp:chrome_extra_resources', 30 'chrome_resources.gyp:chrome_extra_resources',
30 'chrome_resources.gyp:chrome_resources', 31 'chrome_resources.gyp:chrome_resources',
31 'chrome_resources.gyp:platform_locale_settings', 32 'chrome_resources.gyp:platform_locale_settings',
32 'chrome_resources.gyp:theme_resources', 33 'chrome_resources.gyp:theme_resources',
33 'common', 34 'common',
34 'common/extensions/api/api.gyp:api', 35 'common/extensions/api/api.gyp:api',
35 'common_net', 36 'common_net',
36 'contacts_proto', 37 'contacts_proto',
37 'debugger', 38 'debugger',
38 'device_policy_proto', 39 'device_policy_proto',
39 'drive_proto', 40 'drive_proto',
40 'feedback_proto', 41 'feedback_proto',
41 'in_memory_url_index_cache_proto', 42 'in_memory_url_index_cache_proto',
42 'installer_util', 43 'installer_util',
43 'safe_browsing_proto', 44 'safe_browsing_proto',
44 'safe_browsing_report_proto', 45 'safe_browsing_report_proto',
45 'variations_seed_proto', 46 'variations_seed_proto',
46 '../build/linux/system.gyp:dbus', 47 '../build/linux/system.gyp:dbus',
47 '../build/temp_gyp/googleurl.gyp:googleurl', 48 '../build/temp_gyp/googleurl.gyp:googleurl',
48 '../chromeos/chromeos.gyp:chromeos', 49 '../chromeos/chromeos.gyp:chromeos',
49 '../components/components.gyp:autofill_regexes', 50 '../components/components.gyp:autofill_regexes',
50 '../content/content.gyp:content_browser', 51 '../content/content.gyp:content_browser',
51 '../content/content.gyp:content_common', 52 '../content/content.gyp:content_common',
52 '../chromeos/ime/input_method.gyp:gencode',
53 '../crypto/crypto.gyp:crypto', 53 '../crypto/crypto.gyp:crypto',
54 '../dbus/dbus.gyp:dbus', 54 '../dbus/dbus.gyp:dbus',
55 '../device/device.gyp:device_bluetooth', 55 '../device/device.gyp:device_bluetooth',
56 '../media/media.gyp:media', 56 '../media/media.gyp:media',
57 '../net/net.gyp:net', 57 '../net/net.gyp:net',
58 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin 58 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
59 '../printing/printing.gyp:printing', 59 '../printing/printing.gyp:printing',
60 '../skia/skia.gyp:skia', 60 '../skia/skia.gyp:skia',
61 '../sync/sync.gyp:sync', 61 '../sync/sync.gyp:sync',
62 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', 62 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 'browser/chromeos/input_method/input_method_engine.h', 340 'browser/chromeos/input_method/input_method_engine.h',
341 'browser/chromeos/input_method/input_method_manager.h', 341 'browser/chromeos/input_method/input_method_manager.h',
342 'browser/chromeos/input_method/input_method_manager_impl.cc', 342 'browser/chromeos/input_method/input_method_manager_impl.cc',
343 'browser/chromeos/input_method/input_method_manager_impl.h', 343 'browser/chromeos/input_method/input_method_manager_impl.h',
344 'browser/chromeos/input_method/input_method_persistence.cc', 344 'browser/chromeos/input_method/input_method_persistence.cc',
345 'browser/chromeos/input_method/input_method_persistence.h', 345 'browser/chromeos/input_method/input_method_persistence.h',
346 'browser/chromeos/input_method/input_method_util.cc', 346 'browser/chromeos/input_method/input_method_util.cc',
347 'browser/chromeos/input_method/input_method_util.h', 347 'browser/chromeos/input_method/input_method_util.h',
348 'browser/chromeos/input_method/component_extension_ime_manager_impl.cc', 348 'browser/chromeos/input_method/component_extension_ime_manager_impl.cc',
349 'browser/chromeos/input_method/component_extension_ime_manager_impl.h', 349 'browser/chromeos/input_method/component_extension_ime_manager_impl.h',
350 'browser/chromeos/input_method/input_method_whitelist.cc',
351 'browser/chromeos/input_method/input_method_whitelist.h',
350 'browser/chromeos/input_method/mock_ibus_controller.cc', 352 'browser/chromeos/input_method/mock_ibus_controller.cc',
351 'browser/chromeos/input_method/mock_ibus_controller.h', 353 'browser/chromeos/input_method/mock_ibus_controller.h',
352 'browser/chromeos/input_method/xkeyboard.cc', 354 'browser/chromeos/input_method/xkeyboard.cc',
353 'browser/chromeos/input_method/xkeyboard.h', 355 'browser/chromeos/input_method/xkeyboard.h',
354 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc', 356 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc',
355 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h', 357 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h',
356 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc', 358 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc',
357 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h', 359 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h',
358 'browser/chromeos/kiosk_mode/kiosk_mode_settings.cc', 360 'browser/chromeos/kiosk_mode/kiosk_mode_settings.cc',
359 'browser/chromeos/kiosk_mode/kiosk_mode_settings.h', 361 'browser/chromeos/kiosk_mode/kiosk_mode_settings.h',
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 'browser/chromeos/policy/proto/install_attributes.proto', 870 'browser/chromeos/policy/proto/install_attributes.proto',
869 ], 871 ],
870 'variables': { 872 'variables': {
871 'proto_in_dir': 'browser/chromeos/policy/proto', 873 'proto_in_dir': 'browser/chromeos/policy/proto',
872 'proto_out_dir': 'chrome/browser/chromeos/policy/proto', 874 'proto_out_dir': 'chrome/browser/chromeos/policy/proto',
873 }, 875 },
874 'includes': [ '../build/protoc.gypi' ] 876 'includes': [ '../build/protoc.gypi' ]
875 }, 877 },
876 ], 878 ],
877 } 879 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc ('k') | trunk/src/chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698