diff options
| author | eugenebut <eugenebut@chromium.org> | 2015-01-23 16:46:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-24 00:48:07 +0000 |
| commit | f24d6e272a97eab52bc27322e07d4160ece83408 (patch) | |
| tree | 3ba2ffd1b94de28bbdce98cc5c56571331ca88f5 | |
| parent | dd0f0e5da45ede84f56f7d50aee23ab13a1b96f2 (diff) | |
| download | chromium_src-f24d6e272a97eab52bc27322e07d4160ece83408.zip chromium_src-f24d6e272a97eab52bc27322e07d4160ece83408.tar.gz chromium_src-f24d6e272a97eab52bc27322e07d4160ece83408.tar.bz2 | |
Added coverage support for all iOS targets.
build/ios/coverage.gypi is conditionaly included into build/common.gypi
for iOS platform.
BUG=441961
Review URL: https://codereview.chromium.org/867323003
Cr-Commit-Position: refs/heads/master@{#312983}
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/ios/coverage.gypi | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2da6958..8c89382 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5159,6 +5159,9 @@ }, # target_defaults }], # OS=="mac" ['OS=="ios"', { + 'includes': [ + 'ios/coverage.gypi', + ], 'target_defaults': { 'xcode_settings' : { 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', diff --git a/build/ios/coverage.gypi b/build/ios/coverage.gypi index afd3cdc..e822089 100644 --- a/build/ios/coverage.gypi +++ b/build/ios/coverage.gypi @@ -4,11 +4,10 @@ { 'variables': { - 'chromium_code': 1, 'enable_coverage%': 0, }, 'conditions': [ - ['OS=="ios" and enable_coverage', { + ['enable_coverage', { 'target_defaults': { 'defines': [ 'ENABLE_TEST_CODE_COVERAGE=1' |