summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser_chromeos.gypi
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-02-05 08:28:31 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-05 16:29:25 +0000
commit5b27993c4ed9bb439c693b86e7f1190c4d49b6e0 (patch)
treec6acc15276d98531ba5c50a1bf4c8a991ca9257a /chrome/chrome_browser_chromeos.gypi
parent4d5b877dcab754769ee594a043c75e9bcf27d776 (diff)
downloadchromium_src-5b27993c4ed9bb439c693b86e7f1190c4d49b6e0.zip
chromium_src-5b27993c4ed9bb439c693b86e7f1190c4d49b6e0.tar.gz
chromium_src-5b27993c4ed9bb439c693b86e7f1190c4d49b6e0.tar.bz2
Revert of Split ui/base/ime into a new component (patchset #4 id:60001 of https://codereview.chromium.org/889323003/)
Reason for revert: Windows builds failing with ERROR at //ui/base/ime/BUILD.gn:170:5: Undefined variable for +=. libs += [ "imm32.lib" ] ^--- I don't have something with this name in scope now. http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/4403/steps/gn/logs/stdio (perhaps missed a .gn update)? Original issue's description: > Split ui/base/ime into a new component > > The IME code in ui/base/ime depends on ui/ozone to support keyboard > control (via the InputController interface). This dependency is > currently missing from the build. > > Unfortunately, we cannot simply add this dependency, because ui/ozone > depends on code from ui/base/cursor and ui/base/resource > (for cursor bitmaps). > > Break this cycle by componentizing ui/base/ime & add a dependency > from the new ui/base/ime component to ui/ozone. > > This also helps clean things up a bit because iOS builds ui/base > but not ui/base/ime. So there is already a fault line here. > > The handful of IME tests are left as part of ui_base_unittests. > > BUG=445627 > TEST=gn gen out_gn_ozone --args='os="chromeos" use_ozone=true is_component_build=true' && > ninja -C out_gn_ozone chrome ozone_unittests (along with other needed changes) > TBR=jam > > Committed: https://crrev.com/2321ca1b99c1a8e9a90e48a9cd50f6446a7e5e82 > Cr-Commit-Position: refs/heads/master@{#314815} TBR=sky@chromium.org,thakis@chromium.org,jam@chromium.org,yukishiino@chromium.org,spang@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=445627 Review URL: https://codereview.chromium.org/895363005 Cr-Commit-Position: refs/heads/master@{#314823}
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
-rw-r--r--chrome/chrome_browser_chromeos.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 75875a6..415932e 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -1140,7 +1140,6 @@
'../third_party/protobuf/protobuf.gyp:protoc#host',
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/zlib.gyp:zlib',
- '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
'../ui/base/ui_base.gyp:ui_base',
'../ui/display/display.gyp:display',
'../ui/events/devices/events_devices.gyp:events_devices',