Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: ui/gfx/gfx.gyp

Issue 140623002: [Android]: Add content_gl_tests to test_runner.py gtest suite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 66c384eb2787b8d85a352a28aa96ce5913c5223b..bfe21a0b9249a570f9b0460f7641bfa8606a4086 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -68,7 +68,7 @@
# ui_unittests.
bulach 2014/01/16 11:58:03 if this TODO is not obsolete :) looks like it's al
r.kasibhatla 2014/01/16 12:39:16 Sorry, I didn't notice that gfx_geometry_unittests
bulach 2014/01/16 14:06:44 yeah, the tests from gfx_geometry_unittests are al
{
'target_name': 'gfx_geometry_unittests',
- 'type': 'static_library',
+ 'type': '<(gtest_target_type)',
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:test_support_base',
@@ -493,5 +493,19 @@
},
],
}],
+ ['OS == "android" and gtest_target_type == "shared_library"', {
+ 'targets': [
+ {
+ 'target_name': 'gfx_geometry_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [ 'gfx_geometry_unittests', ],
+ 'variables': {
+ 'test_suite_name': 'gfx_geometry_unittests',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gfx_geometry_unittests<(SHARED_LIB_SUFFIX)',
+ },
+ 'includes': [ '../../build/apk_test.gypi', ],
+ },
+ ],
+ }],
],
}
« build/android/pylib/gtest/gtest_config.py ('K') | « build/android/pylib/gtest/gtest_config.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698