OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//testing/rules.gni") | |
6 | 7 |
7 if (is_android) { | 8 if (is_android) { |
8 import("//build/config/android/config.gni") | 9 import("//build/config/android/config.gni") |
9 import("//build/config/android/rules.gni") | 10 import("//build/config/android/rules.gni") |
10 } | 11 } |
11 | 12 |
12 build_ime = !is_ios | 13 build_ime = !is_ios |
13 | 14 |
14 component("base") { | 15 component("base") { |
15 output_name = "ui_base" | 16 output_name = "ui_base" |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
843 | 844 |
844 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 845 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
845 cflags = [ "/wd4267" ] | 846 cflags = [ "/wd4267" ] |
846 } | 847 } |
847 | 848 |
848 if (!is_win || !use_aura) { | 849 if (!is_win || !use_aura) { |
849 sources -= [ "view_prop_unittest.cc" ] | 850 sources -= [ "view_prop_unittest.cc" ] |
850 } | 851 } |
851 | 852 |
852 if (is_android) { | 853 if (is_android) { |
853 deps += [ | 854 apk_deps = [ "//chrome:resources" ] |
854 #"testing/android/native_test.gyp:native_test_native_code" TODO(GYP) | |
tfarina
2015/01/12 18:44:59
Why this is not necessary anymore? I was going to
qsr
2015/01/12 18:48:54
Because this CL change the test template so that w
| |
855 ] | |
856 } | 855 } |
857 | 856 |
858 if (use_pango) { | 857 if (use_pango) { |
859 configs += [ "//build/config/linux:pangocairo" ] | 858 configs += [ "//build/config/linux:pangocairo" ] |
860 } | 859 } |
861 | 860 |
862 if (use_x11) { | 861 if (use_x11) { |
863 sources += [ "cursor/cursor_loader_x11_unittest.cc" ] | 862 sources += [ "cursor/cursor_loader_x11_unittest.cc" ] |
864 | 863 |
865 configs += [ "//build/config/linux:x11" ] | 864 configs += [ "//build/config/linux:x11" ] |
(...skipping 28 matching lines...) Expand all Loading... | |
894 sources += [ | 893 sources += [ |
895 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", | 894 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", |
896 "x/selection_requestor_unittest.cc", | 895 "x/selection_requestor_unittest.cc", |
897 ] | 896 ] |
898 } | 897 } |
899 | 898 |
900 if (is_chromeos) { | 899 if (is_chromeos) { |
901 deps += [ "//chromeos" ] | 900 deps += [ "//chromeos" ] |
902 } | 901 } |
903 } | 902 } |
904 | |
905 # TODO(GYP) Mac (ui_base_tests_bundle) | |
tfarina
2015/01/12 19:10:37
btw, do not remove this Mac TODO. We still need to
qsr
2015/01/12 19:15:52
Will do. The comment was really weird, as it seeme
| |
906 if (is_android) { | |
907 unittest_apk("ui_base_unittests_apk") { | |
tfarina
2015/01/12 18:44:59
Why is is going away now?
qsr
2015/01/12 18:48:54
Because this CL change the test template to automa
| |
908 unittests_dep = ":ui_base_unittests" | |
909 deps = [ | |
910 ":ui_base_unittests", | |
911 "//chrome:resources", | |
912 ] | |
913 } | |
914 } | |
OLD | NEW |