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

Side by Side Diff: testing/gtest.gyp

Issue 10827200: Update iossim.gyp to use src/build/ios/mac_build.gypi. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed comment based on review feedback. Created 8 years, 4 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
« no previous file with comments | « build/common.gypi ('k') | testing/iossim/iossim.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 10 'sources': [
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'gtest_mac.mm', 57 'gtest_mac.mm',
58 'platform_test_mac.mm' 58 'platform_test_mac.mm'
59 ], 59 ],
60 'link_settings': { 60 'link_settings': {
61 'libraries': [ 61 'libraries': [
62 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 62 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
63 ], 63 ],
64 }, 64 },
65 }], 65 }],
66 ['OS == "ios"', { 66 ['OS == "ios"', {
67 'dependencies' : [
68 '<(DEPTH)/testing/iossim/iossim.gyp:iossim',
69 ],
67 'direct_dependent_settings': { 70 'direct_dependent_settings': {
68 'target_conditions': [ 71 'target_conditions': [
69 # Turn all tests into bundles on iOS because that's the only 72 # Turn all tests into bundles on iOS because that's the only
70 # type of executable supported for iOS. 73 # type of executable supported for iOS.
71 ['_type=="executable"', { 74 ['_type=="executable"', {
72 'variables': { 75 'variables': {
73 # Use a variable so the path gets fixed up so it is always 76 # Use a variable so the path gets fixed up so it is always
74 # correct when INFOPLIST_FILE finally gets set. 77 # correct when INFOPLIST_FILE finally gets set.
75 'ios_unittest_info_plist_path': 78 'ios_unittest_info_plist_path':
76 '<(DEPTH)/testing/gtest_ios/unittest-Info.plist', 79 '<(DEPTH)/testing/gtest_ios/unittest-Info.plist',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 { 187 {
185 'target_name': 'gtest_prod', 188 'target_name': 'gtest_prod',
186 'toolsets': ['host', 'target'], 189 'toolsets': ['host', 'target'],
187 'type': 'none', 190 'type': 'none',
188 'sources': [ 191 'sources': [
189 'gtest/include/gtest/gtest_prod.h', 192 'gtest/include/gtest/gtest_prod.h',
190 ], 193 ],
191 }, 194 },
192 ], 195 ],
193 } 196 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | testing/iossim/iossim.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698