From bfa7842bbaf0b94006bc92d90abf6bf5e4d9bef0 Mon Sep 17 00:00:00 2001 From: "rvargas@google.com" Date: Fri, 4 May 2012 23:55:30 +0000 Subject: Revert 135484 - Use Android API for GetDisplayNameForLocale(). failure: http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/4835/steps/BuildTarget/logs/stdio Using Android API, we can reduce the data size of ICU and thus reduce the binary size of chromium-android. BUG=none TEST=L10nUtilTest.GetDisplayNameForLocale,L10nUtilTest.GetDisplayNameForCountry TBR=sky Review URL: http://codereview.chromium.org/10224004 TBR=wangxianzhu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10380018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135490 0039d316-1c4b-4281-b951-d872f2087c98 --- build/all_android.gyp | 2 +- build/android/gtest_filter/ui_unittests_disabled | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'build') diff --git a/build/all_android.gyp b/build/all_android.gyp index ad99339..424425a 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -60,7 +60,6 @@ # 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', ], }] ], @@ -82,6 +81,7 @@ '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 f0a6c2b..4f4406f 100644 --- a/build/android/gtest_filter/ui_unittests_disabled +++ b/build/android/gtest_filter/ui_unittests_disabled @@ -41,8 +41,6 @@ ImageTest.SkiaToSkia ImageTest.SkiaToSkiaRef ImageTest.SwapRepresentations L10nUtilTest.GetAppLocale -L10nUtilTest.GetDisplayNameForCountry -L10nUtilTest.GetDisplayNameForLocale TextEliderTest.ElideEmail TextEliderTest.ElideEmailMoreSpace TextEliderTest.ElideRectangleText -- cgit v1.1