Index: trunk/src/ui/keyboard/keyboard.gyp |
=================================================================== |
--- trunk/src/ui/keyboard/keyboard.gyp (revision 194584) |
+++ trunk/src/ui/keyboard/keyboard.gyp (working copy) |
@@ -8,59 +8,35 @@ |
}, |
'targets': [ |
{ |
- 'target_name': 'keyboard_resources', |
- 'type': 'none', |
- 'variables': { |
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard', |
- }, |
- 'actions': [ |
- { |
- 'action_name': 'keyboard_resources', |
- 'variables': { |
- 'grit_grd_file': 'keyboard_resources.grd', |
- }, |
- 'includes': [ '../../build/grit_action.gypi' ], |
- }, |
- ], |
- 'includes': [ '../../build/grit_target.gypi' ], |
- }, |
- { |
'target_name': 'keyboard', |
'type': '<(component)', |
'dependencies': [ |
'../../base/base.gyp:base', |
- '../../content/content.gyp:content_browser', |
'../../skia/skia.gyp:skia', |
'../aura/aura.gyp:aura', |
'../compositor/compositor.gyp:compositor', |
'../ui.gyp:ui', |
- 'keyboard_resources', |
], |
'defines': [ |
'KEYBOARD_IMPLEMENTATION', |
], |
'sources': [ |
- 'keyboard_constants.cc', |
- 'keyboard_constants.h', |
'keyboard_controller.cc', |
'keyboard_controller.h', |
'keyboard_controller_proxy.h', |
'keyboard_export.h', |
'keyboard_switches.cc', |
'keyboard_switches.h', |
- 'keyboard_ui_controller.cc', |
- 'keyboard_ui_controller.h', |
'keyboard_util.cc', |
'keyboard_util.h', |
] |
}, |
{ |
'target_name': 'keyboard_unittests', |
- 'type': '<(gtest_target_type)', |
+ 'type': 'executable', |
'dependencies': [ |
'../../base/base.gyp:base', |
'../../base/base.gyp:test_support_base', |
- '../../content/content.gyp:content_browser', |
'../../skia/skia.gyp:skia', |
'../../testing/gtest.gyp:gtest', |
'../aura/aura.gyp:aura', |
@@ -75,17 +51,6 @@ |
'keyboard_controller_unittest.cc', |
'keyboard_test_suite.cc', |
], |
- 'conditions': [ |
- [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
- 'conditions': [ |
- ['linux_use_tcmalloc==1', { |
- 'dependencies': [ |
- '../../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ], |
- }], |
- ], |
}, |
], |
} |