Enable ui_unittests in Android build

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9958026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130188 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 64 insertions, 1 deletions

diff --git a/build/all_android.gyp b/build/all_android.gyp
index 0c43df0..bfc1bc9 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -35,6 +35,7 @@
         '../sql/sql.gyp:sql_unittests',
         '../ipc/ipc.gyp:ipc_tests',
         '../net/net.gyp:net_unittests',
+        '../ui/ui.gyp:ui_unittests',
         '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
         # From here down: not added to run_tests.py yet.
         '../jingle/jingle.gyp:jingle_unittests',
diff --git a/build/android/gtest_filter/ui_unittests_disabled b/build/android/gtest_filter/ui_unittests_disabled
new file mode 100644
index 0000000..791073e
--- /dev/null
+++ b/build/android/gtest_filter/ui_unittests_disabled
@@ -0,0 +1,62 @@
+# List of suppressions
+# This file was automatically generated by build/android/run_tests.py
+BytesFormattingTest.FormatBytes
+ClipboardTest.ClearTest
+ClipboardTest.DataTest
+ClipboardTest.HTMLTest
+ClipboardTest.InternalClipboardInvalidation
+ClipboardTest.MultiFormatTest
+ClipboardTest.MultipleDataTest
+ClipboardTest.SharedBitmapTest
+ClipboardTest.TextTest
+ClipboardTest.TrickyHTMLTest
+ClipboardTest.URLTest
+ClipboardTest.WriteEverything
+FontListTest.FontDescString_FromFont
+FontListTest.FontDescString_FromFontVector
+FontListTest.FontDescString_FromFontWithNonNormalStyle
+FontListTest.Fonts_DeriveFontList
+FontListTest.Fonts_DeriveFontListWithSize
+FontListTest.Fonts_DescStringWithStyleInFlexibleFormat_RoundTrip
+FontListTest.Fonts_FontVector_RoundTrip
+FontListTest.Fonts_FromDescString
+FontListTest.Fonts_FromDescStringInFlexibleFormat
+FontListTest.Fonts_FromDescStringWithStyleInFlexibleFormat
+FontListTest.Fonts_FromFont
+FontListTest.Fonts_FromFontVector
+FontListTest.Fonts_FromFontWithNonNormalStyle
+FontListTest.Fonts_GetStyle
+FontTest.Ascent
+FontTest.AvgCharWidth
+FontTest.AvgWidths
+FontTest.Height
+FontTest.LoadArial
+FontTest.LoadArialBold
+FontTest.Widths
+ImageTest.CheckSkiaColor
+ImageTest.Copy
+ImageTest.PlatformToPlatform
+ImageTest.PlatformToSkia
+ImageTest.SkiaRefToSkia
+ImageTest.SkiaToPlatform
+ImageTest.SkiaToSkia
+ImageTest.SkiaToSkiaRef
+ImageTest.SwapRepresentations
+L10nUtilTest.GetAppLocale
+PNGCodec.EncodeBGRASkBitmapDiscardTransparency
+SkBitmapOperationsTest.CreateHSLShiftedBitmapHueOnly
+SkBitmapOperationsTest.UnPreMultiply
+TreeNodeIteratorPruneTest.Test
+TextEliderTest.ElideEmail
+TextEliderTest.ElideEmailMoreSpace
+TextEliderTest.ElideRectangleText
+TextEliderTest.ElideRectangleTextLongWords
+TextEliderTest.ElideRectangleTextPunctuation
+TextEliderTest.ElideTextLongStrings
+TextEliderTest.ElideTextSurrogatePairs
+TextEliderTest.ElideTextTruncate
+TextEliderTest.TestFileURLEliding
+TextEliderTest.TestFilenameEliding
+TextEliderTest.TestGeneralEliding
+TextEliderTest.TestMoreEliding
+TextEliderTest.TestTrailingEllipsisSlashEllipsisHack
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index dc1ec7e..65951e6 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -67,7 +67,7 @@ from test_package_executable import TestPackageExecutable
 from test_result import BaseTestResult, TestResults
 
 _TEST_SUITES = ['base_unittests', 'sql_unittests', 'ipc_tests', 'net_unittests',
-                'sync_unit_tests', 'content_unittests']
+                'sync_unit_tests', 'content_unittests', 'ui_unittests']
 
 
 def FullyQualifiedTestSuites():