diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 12:10:34 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 12:10:34 +0000 |
commit | 25b0fbaef6b6cb6695f9fa46498ff01acdac77b5 (patch) | |
tree | b623d8bcf0bdd5b7194d15038031e9f229e80959 /cc/cc_tests.gyp | |
parent | 3b0bb3b06f5813c232d859f9b34b2f8f3bbfef99 (diff) | |
download | chromium_src-25b0fbaef6b6cb6695f9fa46498ff01acdac77b5.zip chromium_src-25b0fbaef6b6cb6695f9fa46498ff01acdac77b5.tar.gz chromium_src-25b0fbaef6b6cb6695f9fa46498ff01acdac77b5.tar.bz2 |
cc: Prettify cc_tests.gyp.
Pass this gyp file through tools/gyp/tools/pretty_gyp.py. Seems better to
have a tool to format our gyp files rather than relying on humans to format it
correctly by hand.
R=enne@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/20607002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/cc_tests.gyp')
-rw-r--r-- | cc/cc_tests.gyp | 110 |
1 files changed, 61 insertions, 49 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index ff5b40b..181ce09 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -202,20 +202,26 @@ '.', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', + ['OS == "android" and gtest_target_type == "shared_library"', + { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + } + ], + [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', + { + 'conditions': [ + [ 'linux_use_tcmalloc==1', + { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + } ], - }], - ], - }], + ], + } + ], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], @@ -245,17 +251,21 @@ '.', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], + ['OS == "android" and gtest_target_type == "shared_library"', + { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + } + ], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], + ['OS=="linux" and linux_use_tcmalloc==1', + { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + } + ], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], @@ -304,33 +314,35 @@ 'conditions': [ # Special target to wrap a gtest_target_type==shared_library # cc_unittests into an android apk for execution. - ['OS == "android" and gtest_target_type == "shared_library"', { - 'targets': [ - { - 'target_name': 'cc_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'cc_unittests', - ], - 'variables': { - 'test_suite_name': 'cc_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_unittests<(SHARED_LIB_SUFFIX)', + ['OS == "android" and gtest_target_type == "shared_library"', + { + 'targets': [ + { + 'target_name': 'cc_unittests_apk', + 'type': 'none', + 'dependencies': [ + 'cc_unittests', + ], + 'variables': { + 'test_suite_name': 'cc_unittests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_unittests<(SHARED_LIB_SUFFIX)', + }, + 'includes': [ '../build/apk_test.gypi' ], }, - 'includes': [ '../build/apk_test.gypi' ], - }, - { - 'target_name': 'cc_perftests_apk', - 'type': 'none', - 'dependencies': [ - 'cc_perftests', - ], - 'variables': { - 'test_suite_name': 'cc_perftests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perftests<(SHARED_LIB_SUFFIX)', + { + 'target_name': 'cc_perftests_apk', + 'type': 'none', + 'dependencies': [ + 'cc_perftests', + ], + 'variables': { + 'test_suite_name': 'cc_perftests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perftests<(SHARED_LIB_SUFFIX)', + }, + 'includes': [ '../build/apk_test.gypi' ], }, - 'includes': [ '../build/apk_test.gypi' ], - }, - ], - }] + ], + } + ] ], } |