diff options
| author | eugenebut <eugenebut@chromium.org> | 2015-01-21 12:21:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 20:22:23 +0000 |
| commit | 07a8e92fb99ff03230122c2341e2d3b017216757 (patch) | |
| tree | ee37ec723248493ed79d5a0e7e7d468057206d8d /build | |
| parent | 950f0d49b0157ed4497430b3ce13e4710945d6c0 (diff) | |
| download | chromium_src-07a8e92fb99ff03230122c2341e2d3b017216757.zip chromium_src-07a8e92fb99ff03230122c2341e2d3b017216757.tar.gz chromium_src-07a8e92fb99ff03230122c2341e2d3b017216757.tar.bz2 | |
Upstream //build/ios/coverage.gypi
Add OWNERS for build/ios.
Use Xcode clang compiler for coverage configuration.
BUG=450379
Review URL: https://codereview.chromium.org/853293002
Cr-Commit-Position: refs/heads/master@{#312416}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | build/ios/OWNERS | 3 | ||||
| -rw-r--r-- | build/ios/coverage.gypi | 33 |
3 files changed, 43 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 119f5b4..8c6eb81 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2058,6 +2058,9 @@ 'grit_defines': ['-D', 'scale_factors=2x'], }], ['OS == "ios"', { + 'variables': { + 'enable_coverage%': 0, + }, 'grit_defines': [ '-t', 'ios', # iOS uses a whitelist to filter resources. @@ -2073,7 +2076,10 @@ # TODO(sdefresne): Remove the target_subarch check once Apple has # upstreamed the support for "arm64". http://crbug.com/341453 - ['target_subarch!="arm32" or "<(GENERATOR)"=="xcode"', { + # TODO(eugenebut): Remove enable_coverage check once + # libclang_rt.profile_ios.a is bundled with Chromium's clang. + # http://crbug.com/450379 + ['target_subarch!="arm32" or enable_coverage or "<(GENERATOR)"=="xcode"', { 'clang_xcode%': 1, }], ], diff --git a/build/ios/OWNERS b/build/ios/OWNERS new file mode 100644 index 0000000..1c3e6c8 --- /dev/null +++ b/build/ios/OWNERS @@ -0,0 +1,3 @@ +rohitrao@chromium.org +stuartmorgan@chromium.org + diff --git a/build/ios/coverage.gypi b/build/ios/coverage.gypi new file mode 100644 index 0000000..afd3cdc --- /dev/null +++ b/build/ios/coverage.gypi @@ -0,0 +1,33 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, + 'enable_coverage%': 0, + }, + 'conditions': [ + ['OS=="ios" and enable_coverage', { + 'target_defaults': { + 'defines': [ + 'ENABLE_TEST_CODE_COVERAGE=1' + ], + 'link_settings': { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ + '-fprofile-arcs', + ], + }, + }, + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-fprofile-arcs', + '-ftest-coverage', + ], + }, + }, + }], + ], +} + |