Chromium Code Reviews| Index: ui/gfx/gfx.gyp |
| diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp |
| index 7e7d67aeb39e49386bef895cabdb962edaf9b95a..e628e10ab6634c09d9bc75f43d2ac79f9abb1cad 100644 |
| --- a/ui/gfx/gfx.gyp |
| +++ b/ui/gfx/gfx.gyp |
| @@ -494,7 +494,7 @@ |
| }, |
| { |
| 'target_name': 'gfx_unittests', |
| - 'type': 'executable', |
| + 'type': '<(gtest_target_type)', |
| 'sources': [ |
| 'geometry/box_unittest.cc', |
| 'geometry/cubic_bezier_unittest.cc', |
| @@ -539,5 +539,24 @@ |
| }, |
| ], |
| }], |
| + # Special target to wrap a gtest_target_type==shared_library |
| + # ui_unittests into an android apk for execution. |
|
danakj
2014/04/04 14:34:37
gfx_unittests
tfarina
2014/04/05 00:12:36
Done.
|
| + # See base.gyp for TODO(jrg)s about this strategy. |
| + ['OS == "android" and gtest_target_type == "shared_library"', { |
| + 'targets': [ |
| + { |
| + 'target_name': 'gfx_unittests_apk', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'gfx_unittests', |
| + ], |
| + 'variables': { |
| + 'test_suite_name': 'gfx_unittests', |
| + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gfx_unittests<(SHARED_LIB_SUFFIX)', |
|
cjhopman
2014/04/04 18:14:25
nit: input_shlib_path isn't needed
(it appears in
tfarina
2014/04/05 00:12:36
Done.
|
| + }, |
| + 'includes': [ '../../build/apk_test.gypi' ], |
| + }, |
| + ], |
| + }], |
| ], |
| } |