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

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'geometry/vector2d_conversions.cc', 58 'geometry/vector2d_conversions.cc',
59 'geometry/vector2d_conversions.h', 59 'geometry/vector2d_conversions.h',
60 'geometry/vector2d_f.cc', 60 'geometry/vector2d_f.cc',
61 'geometry/vector2d_f.h', 61 'geometry/vector2d_f.h',
62 'geometry/vector3d_f.cc', 62 'geometry/vector3d_f.cc',
63 'geometry/vector3d_f.h', 63 'geometry/vector3d_f.h',
64 ], 64 ],
65 }, 65 },
66 # TODO(beng): This should either generate its own executable or be part of 66 # TODO(beng): This should either generate its own executable or be part of
67 # a gfx_unittests executable. Currently it's built as part of 67 # a gfx_unittests executable. Currently it's built as part of
68 # ui_unittests. 68 # 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
69 { 69 {
70 'target_name': 'gfx_geometry_unittests', 70 'target_name': 'gfx_geometry_unittests',
71 'type': 'static_library', 71 'type': '<(gtest_target_type)',
72 'dependencies': [ 72 'dependencies': [
73 '<(DEPTH)/base/base.gyp:base', 73 '<(DEPTH)/base/base.gyp:base',
74 '<(DEPTH)/base/base.gyp:test_support_base', 74 '<(DEPTH)/base/base.gyp:test_support_base',
75 '<(DEPTH)/testing/gtest.gyp:gtest', 75 '<(DEPTH)/testing/gtest.gyp:gtest',
76 'gfx_geometry', 76 'gfx_geometry',
77 ], 77 ],
78 'sources': [ 78 'sources': [
79 'geometry/box_unittest.cc', 79 'geometry/box_unittest.cc',
80 'geometry/insets_unittest.cc', 80 'geometry/insets_unittest.cc',
81 'geometry/matrix3_unittest.cc', 81 'geometry/matrix3_unittest.cc',
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java', 486 '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
487 ], 487 ],
488 'variables': { 488 'variables': {
489 'jni_gen_package': 'ui/gfx', 489 'jni_gen_package': 'ui/gfx',
490 'jni_generator_ptr_type': 'long' 490 'jni_generator_ptr_type': 'long'
491 }, 491 },
492 'includes': [ '../../build/jni_generator.gypi' ], 492 'includes': [ '../../build/jni_generator.gypi' ],
493 }, 493 },
494 ], 494 ],
495 }], 495 }],
496 ['OS == "android" and gtest_target_type == "shared_library"', {
497 'targets': [
498 {
499 'target_name': 'gfx_geometry_unittests_apk',
500 'type': 'none',
501 'dependencies': [ 'gfx_geometry_unittests', ],
502 'variables': {
503 'test_suite_name': 'gfx_geometry_unittests',
504 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gfx_geome try_unittests<(SHARED_LIB_SUFFIX)',
505 },
506 'includes': [ '../../build/apk_test.gypi', ],
507 },
508 ],
509 }],
496 ], 510 ],
497 } 511 }
OLDNEW
« 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