diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 07:54:35 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 07:54:35 +0000 |
| commit | 97c747b5e54da43db3fb8bf49882f34fb565610e (patch) | |
| tree | a01b5f2144a214602aaf66fd8c921b2dae145d08 /gpu | |
| parent | 56546bb8dcc228e10cedfa6f11626e452f711c04 (diff) | |
| download | chromium_src-97c747b5e54da43db3fb8bf49882f34fb565610e.zip chromium_src-97c747b5e54da43db3fb8bf49882f34fb565610e.tar.gz chromium_src-97c747b5e54da43db3fb8bf49882f34fb565610e.tar.bz2 | |
Add APK targets for gpu_unittests.
Removing dependency on testing/gmock.gyp:gmock_main as we have our own
main in command_buffer/common/unittest_main.cc
BUG=125059
Follow-up to: http://codereview.chromium.org/10399126/
TEST=
Review URL: https://chromiumcodereview.appspot.com/10459017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/gpu_common.gypi | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 135f061..a28698e 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -116,12 +116,11 @@ }, { 'target_name': 'gpu_unittests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', - '../testing/gmock.gyp:gmock_main', '../testing/gtest.gyp:gtest', '../third_party/angle/src/build_angle.gyp:translator_glsl', '../ui/gl/gl.gyp:gl', @@ -198,6 +197,13 @@ 'command_buffer/service/transfer_buffer_manager_unittest.cc', 'command_buffer/service/vertex_attrib_manager_unittest.cc', ], + 'conditions': [ + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ], }, { 'target_name': 'gl_tests', @@ -256,4 +262,26 @@ ], }, ], + 'conditions': [ + # Special target to wrap a gtest_target_type==shared_library + # gpu_unittests into an android apk for execution. + ['OS == "android" and gtest_target_type == "shared_library"', { + 'targets': [ + { + 'target_name': 'gpu_unittests_apk', + 'type': 'none', + 'dependencies': [ + '../base/base.gyp:base_java', + 'gpu_unittests', + ], + 'variables': { + 'test_suite_name': 'gpu_unittests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gpu_unittests<(SHARED_LIB_SUFFIX)', + 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], + }, + 'includes': [ '../build/apk_test.gypi' ], + }, + ], + }], + ], } |