diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 21:26:50 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 21:26:50 +0000 |
| commit | d08818412474bef6aaba7c3e8e259150cbf8414c (patch) | |
| tree | 389517cd60a6fed1cf1e661c226455730b9083d2 /gpu/gpu.gyp | |
| parent | f068492afc554db6f8a3d018422e5a0bcfedb29f (diff) | |
| download | chromium_src-d08818412474bef6aaba7c3e8e259150cbf8414c.zip chromium_src-d08818412474bef6aaba7c3e8e259150cbf8414c.tar.gz chromium_src-d08818412474bef6aaba7c3e8e259150cbf8414c.tar.bz2 | |
Make gl_tests apk for android
BUG=180432
Review URL: https://chromiumcodereview.appspot.com/12502009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 8255fd88..1bb1105 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -219,7 +219,7 @@ }, { 'target_name': 'gl_tests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', @@ -264,6 +264,13 @@ 'command_buffer/tests/gl_stream_draw_unittests.cc', 'command_buffer/tests/occlusion_query_unittests.cc', ], + 'conditions': [ + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, @@ -481,5 +488,23 @@ }, ], }], + ['OS == "android" and gtest_target_type == "shared_library"', { + 'targets': [ + { + 'target_name': 'gl_tests_apk', + 'type': 'none', + 'dependencies': [ + 'gl_tests', + ], + 'variables': { + 'test_suite_name': 'gl_tests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests<(SHARED_LIB_SUFFIX)', + }, + 'includes': [ + '../build/apk_test.gypi', + ], + }, + ], + }], ], } |