From 17799e74e57a9c4bdf47afa950bf65d47bf68c3e Mon Sep 17 00:00:00 2001 From: tfarina Date: Thu, 8 Jan 2015 07:00:07 -0800 Subject: [PATCH] ui/base: Add the GN version of ui_base_unittests_apk target. This fixes two Android TODOs that were in ui/base/BUILD.gn Tested with the following command lines: $ out/Debug/gn gen out_gn/Debug/ --args='is_debug=true os="android" cpu_arch="arm"' $ ninja -C out_gn/Debug ui_base_unittests ui_base_unittests_apk BUG=None TEST=see above R=cjhopman@chromium.org Review URL: https://codereview.chromium.org/821153002 Cr-Commit-Position: refs/heads/master@{#310503} --- ui/base/BUILD.gn | 317 ++++++++++++++++++++++++----------------------- 1 file changed, 162 insertions(+), 155 deletions(-) diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 58f2b5fd70f2..a40aa8b3e992 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -727,181 +727,188 @@ if (is_android) { } } -# TODO(GYP): Make this work on Android and reenable it. -if (!is_android) { - # GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests - test("ui_base_unittests") { - sources = [ - "l10n/l10n_util_mac_unittest.mm", - "l10n/l10n_util_unittest.cc", - "l10n/l10n_util_win_unittest.cc", - "l10n/time_format_unittest.cc", - "layout_unittest.cc", - "models/tree_node_iterator_unittest.cc", - "resource/data_pack_literal.cc", - "resource/data_pack_unittest.cc", - "resource/resource_bundle_unittest.cc", - "test/test_clipboard_unittest.cc", - "test/run_all_unittests.cc", - ] - - if (is_ios) { - # Compile this Mac file on iOS as well. - set_sources_assignment_filter([]) - sources += [ "l10n/l10n_util_mac_unittest.mm" ] - set_sources_assignment_filter(sources_assignment_filter) - } else { # !is_ios - sources += [ - "accelerators/accelerator_manager_unittest.cc", - "accelerators/menu_label_accelerator_util_linux_unittest.cc", - "clipboard/custom_data_helper_unittest.cc", - "cocoa/base_view_unittest.mm", - "cocoa/cocoa_base_utils_unittest.mm", - "cocoa/controls/blue_label_button_unittest.mm", - "cocoa/controls/hover_image_menu_button_unittest.mm", - "cocoa/controls/hyperlink_button_cell_unittest.mm", - "cocoa/controls/hyperlink_text_view_unittest.mm", - "cocoa/focus_tracker_unittest.mm", - "cocoa/fullscreen_window_manager_unittest.mm", - "cocoa/hover_image_button_unittest.mm", - "cocoa/menu_controller_unittest.mm", - "cocoa/nsgraphics_context_additions_unittest.mm", - "cocoa/nsview_additions_unittest.mm", - "cocoa/tracking_area_unittest.mm", - "models/list_model_unittest.cc", - "models/list_selection_model_unittest.cc", - "models/tree_node_model_unittest.cc", - "test/data/resource.h", - "text/bytes_formatting_unittest.cc", - "touch/selection_bound_unittest.cc", - "view_prop_unittest.cc", - "webui/web_ui_util_unittest.cc", - ] - } +# GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests +test("ui_base_unittests") { + sources = [ + "l10n/l10n_util_mac_unittest.mm", + "l10n/l10n_util_unittest.cc", + "l10n/l10n_util_win_unittest.cc", + "l10n/time_format_unittest.cc", + "layout_unittest.cc", + "models/tree_node_iterator_unittest.cc", + "resource/data_pack_literal.cc", + "resource/data_pack_unittest.cc", + "resource/resource_bundle_unittest.cc", + "test/test_clipboard_unittest.cc", + "test/run_all_unittests.cc", + ] - if (build_ime) { - sources += [ - "ime/candidate_window_unittest.cc", + if (is_ios) { + # Compile this Mac file on iOS as well. + set_sources_assignment_filter([]) + sources += [ "l10n/l10n_util_mac_unittest.mm" ] + set_sources_assignment_filter(sources_assignment_filter) + } else { # !is_ios + sources += [ + "accelerators/accelerator_manager_unittest.cc", + "accelerators/menu_label_accelerator_util_linux_unittest.cc", + "clipboard/custom_data_helper_unittest.cc", + "cocoa/base_view_unittest.mm", + "cocoa/cocoa_base_utils_unittest.mm", + "cocoa/controls/blue_label_button_unittest.mm", + "cocoa/controls/hover_image_menu_button_unittest.mm", + "cocoa/controls/hyperlink_button_cell_unittest.mm", + "cocoa/controls/hyperlink_text_view_unittest.mm", + "cocoa/focus_tracker_unittest.mm", + "cocoa/fullscreen_window_manager_unittest.mm", + "cocoa/hover_image_button_unittest.mm", + "cocoa/menu_controller_unittest.mm", + "cocoa/nsgraphics_context_additions_unittest.mm", + "cocoa/nsview_additions_unittest.mm", + "cocoa/tracking_area_unittest.mm", + "models/list_model_unittest.cc", + "models/list_selection_model_unittest.cc", + "models/tree_node_model_unittest.cc", + "test/data/resource.h", + "text/bytes_formatting_unittest.cc", + "touch/selection_bound_unittest.cc", + "view_prop_unittest.cc", + "webui/web_ui_util_unittest.cc", + ] + } + + if (build_ime) { + sources += [ + "ime/candidate_window_unittest.cc", + "ime/chromeos/character_composer_unittest.cc", + "ime/input_method_base_unittest.cc", + "ime/input_method_chromeos_unittest.cc", + "ime/remote_input_method_win_unittest.cc", + "ime/win/imm32_manager_unittest.cc", + "ime/win/tsf_input_scope_unittest.cc", + ] + if (use_x11) { + sources += [ "ime/composition_text_util_pango_unittest.cc" ] + } + if (!use_x11 && is_chromeos) { + # These were already removed in the non-chromeos case. + sources -= [ "ime/chromeos/character_composer_unittest.cc", - "ime/input_method_base_unittest.cc", "ime/input_method_chromeos_unittest.cc", - "ime/remote_input_method_win_unittest.cc", - "ime/win/imm32_manager_unittest.cc", - "ime/win/tsf_input_scope_unittest.cc", ] - if (use_x11) { - sources += [ "ime/composition_text_util_pango_unittest.cc" ] - } - if (!use_x11 && is_chromeos) { - # These were already removed in the non-chromeos case. - sources -= [ - "ime/chromeos/character_composer_unittest.cc", - "ime/input_method_chromeos_unittest.cc", - ] - } } + } - deps = [ - "//base", - "//base/allocator", - "//base/test:test_support", - "//net", - "//skia", - "//testing/gmock", - "//testing/gtest", - "//third_party/icu", - "//ui/base", - "//ui/base:test_support", - "//ui/events:events_base", - "//ui/events:test_support", - "//ui/gfx:test_support", - "//ui/resources", - "//ui/resources:ui_test_pak", - "//ui/strings", - "//url", - ] - - if (is_ios) { - # TODO(GYP) lots of iOS-only steps for ui_base_unittests - } + deps = [ + "//base", + "//base/allocator", + "//base/test:test_support", + "//net", + "//skia", + "//testing/gmock", + "//testing/gtest", + "//third_party/icu", + "//ui/base", + "//ui/base:test_support", + "//ui/events:events_base", + "//ui/events:test_support", + "//ui/gfx:test_support", + "//ui/resources", + "//ui/resources:ui_test_pak", + "//ui/strings", + "//url", + ] - if (is_win) { - sources += [ - "dragdrop/os_exchange_data_win_unittest.cc", - "win/hwnd_subclass_unittest.cc", - "win/open_file_name_win_unittest.cc", - ] + if (is_ios) { + # TODO(GYP) lots of iOS-only steps for ui_base_unittests + } - ldflags = [ - "/DELAYLOAD:d2d1.dll", - "/DELAYLOAD:d3d10_1.dll", - ] - libs = [ - "d2d1.lib", - "d3d10_1.lib", - "imm32.lib", - "oleacc.lib", - ] + if (is_win) { + sources += [ + "dragdrop/os_exchange_data_win_unittest.cc", + "win/hwnd_subclass_unittest.cc", + "win/open_file_name_win_unittest.cc", + ] - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] - } + ldflags = [ + "/DELAYLOAD:d2d1.dll", + "/DELAYLOAD:d3d10_1.dll", + ] + libs = [ + "d2d1.lib", + "d3d10_1.lib", + "imm32.lib", + "oleacc.lib", + ] - if (is_android) { - deps += [ - #"testing/android/native_test.gyp:native_test_native_code" TODO(GYP) - ] - } + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] + } - if (use_pango) { - configs += [ "//build/config/linux:pangocairo" ] - } + if (!is_win || !use_aura) { + sources -= [ "view_prop_unittest.cc" ] + } - if (use_x11) { - sources += [ "cursor/cursor_loader_x11_unittest.cc" ] + if (is_android) { + deps += [ + #"testing/android/native_test.gyp:native_test_native_code" TODO(GYP) + ] + } - configs += [ "//build/config/linux:x11" ] + if (use_pango) { + configs += [ "//build/config/linux:pangocairo" ] + } - deps += [ - "//ui/events/platform/x11", - "//ui/gfx/x", - ] + if (use_x11) { + sources += [ "cursor/cursor_loader_x11_unittest.cc" ] - datadeps = [ - "//tools/xdisplaycheck", - ] - } + configs += [ "//build/config/linux:x11" ] - if (!is_win || !use_aura) { - sources -= [ "view_prop_unittest.cc" ] - } + deps += [ + "//ui/events/platform/x11", + "//ui/gfx/x", + ] - if (is_mac) { - deps += [ - "//third_party/mozilla", - #'ui_base_tests_bundle', TODO(GYP) - ] - } + datadeps = [ + "//tools/xdisplaycheck", + ] + } - if (use_aura || toolkit_views) { - sources += [ "dragdrop/os_exchange_data_unittest.cc" ] + if (is_mac) { + deps += [ + "//third_party/mozilla", + #'ui_base_tests_bundle', TODO(GYP) + ] + } - deps += [ - "//ui/events", - "//ui/events/platform", - ] - } + if (use_aura || toolkit_views) { + sources += [ "dragdrop/os_exchange_data_unittest.cc" ] - if (use_x11 && !is_chromeos) { - sources += [ - "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", - "x/selection_requestor_unittest.cc", - ] - } + deps += [ + "//ui/events", + "//ui/events/platform", + ] + } - if (is_chromeos) { - deps += [ "//chromeos" ] - } + if (use_x11 && !is_chromeos) { + sources += [ + "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", + "x/selection_requestor_unittest.cc", + ] + } + + if (is_chromeos) { + deps += [ "//chromeos" ] + } +} + +# TODO(GYP) Mac (ui_base_tests_bundle) +if (is_android) { + unittest_apk("ui_base_unittests_apk") { + unittests_dep = ":ui_base_unittests" + deps = [ + ":ui_base_unittests", + "//chrome:resources", + ] } } -# TODO(GYP) Mac (ui_base_tests_bundle) and Android (ui_base_unittests_apk).