diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/all_android.gyp | 2 | ||||
-rw-r--r-- | build/android/gtest_filter/ui_unittests_disabled | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 424425a..ad99339 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -60,6 +60,7 @@ # Unit test bundles packaged as an apk. '../base/base.gyp:base_unittests_apk', '../ipc/ipc.gyp:ipc_tests_apk', + '../ui/ui.gyp:ui_unittests_apk', ], }] ], @@ -81,7 +82,6 @@ 'type': 'none', 'dependencies': [ '../content/content.gyp:content_browsertests', - '../ui/ui.gyp:gfx_unittests', ], }, ], # targets diff --git a/build/android/gtest_filter/ui_unittests_disabled b/build/android/gtest_filter/ui_unittests_disabled index 4f4406f..f0a6c2b 100644 --- a/build/android/gtest_filter/ui_unittests_disabled +++ b/build/android/gtest_filter/ui_unittests_disabled @@ -41,6 +41,8 @@ ImageTest.SkiaToSkia ImageTest.SkiaToSkiaRef ImageTest.SwapRepresentations L10nUtilTest.GetAppLocale +L10nUtilTest.GetDisplayNameForCountry +L10nUtilTest.GetDisplayNameForLocale TextEliderTest.ElideEmail TextEliderTest.ElideEmailMoreSpace TextEliderTest.ElideRectangleText |