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

Side by Side Diff: build/common.gypi

Issue 14577007: Gyp changes for ninja iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set generator inside mac_build Created 7 years, 7 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 | « no previous file | build/ios/mac_build.gypi » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 3964 matching lines...) Expand 10 before | Expand all | Expand 10 after
3975 'STRIP_INSTALLED_PRODUCT': 'YES', 3975 'STRIP_INSTALLED_PRODUCT': 'YES',
3976 }, 3976 },
3977 }, 3977 },
3978 'Debug_Base': { 3978 'Debug_Base': {
3979 'xcode_settings': { 3979 'xcode_settings': {
3980 # Remove dSYM to reduce build time. 3980 # Remove dSYM to reduce build time.
3981 'DEBUG_INFORMATION_FORMAT': 'dwarf', 3981 'DEBUG_INFORMATION_FORMAT': 'dwarf',
3982 }, 3982 },
3983 }, 3983 },
3984 }, 3984 },
3985 'xcode_settings': { 3985 'conditions': [
3986 'conditions': [ 3986 # TODO(justincohen): ninja builds don't support signing yet.
3987 ['chromium_ios_signing', { 3987 ['"<(GENERATOR)"!="ninja"', {
3988 # iOS SDK wants everything for device signed. 3988 'xcode_settings': {
3989 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', 3989 'conditions': [
3990 }, { 3990 ['chromium_ios_signing', {
3991 'CODE_SIGNING_REQUIRED': 'NO', 3991 # iOS SDK wants everything for device signed.
3992 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 3992 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
3993 }], 3993 }, {
3994 ], 3994 'CODE_SIGNING_REQUIRED': 'NO',
3995 }, 3995 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
3996 }],
3997 ],
3998 },
3999 }],
4000 ],
3996 }], 4001 }],
3997 ], # target_conditions 4002 ], # target_conditions
3998 }, # target_defaults 4003 }, # target_defaults
3999 }], # OS=="ios" 4004 }], # OS=="ios"
4000 ['OS=="win"', { 4005 ['OS=="win"', {
4001 'target_defaults': { 4006 'target_defaults': {
4002 'defines': [ 4007 'defines': [
4003 '_WIN32_WINNT=0x0602', 4008 '_WIN32_WINNT=0x0602',
4004 'WINVER=0x0602', 4009 'WINVER=0x0602',
4005 'WIN32', 4010 'WIN32',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
4334 ['mac_sdk_path==""', { 4339 ['mac_sdk_path==""', {
4335 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 4340 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
4336 }, { 4341 }, {
4337 'SDKROOT': '<(mac_sdk_path)', # -isysroot 4342 'SDKROOT': '<(mac_sdk_path)', # -isysroot
4338 }], 4343 }],
4339 ], 4344 ],
4340 }], 4345 }],
4341 ['OS=="ios"', { 4346 ['OS=="ios"', {
4342 'conditions': [ 4347 'conditions': [
4343 ['ios_sdk_path==""', { 4348 ['ios_sdk_path==""', {
4344 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot 4349 'conditions': [
4350 # TODO(justincohen): Ninja only supports simulator for now.
4351 ['"<(GENERATOR)"=="ninja"', {
4352 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot
4353 }, {
4354 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot
4355 }],
4356 ],
4345 }, { 4357 }, {
4346 'SDKROOT': '<(ios_sdk_path)', # -isysroot 4358 'SDKROOT': '<(ios_sdk_path)', # -isysroot
4347 }], 4359 }],
4348 ], 4360 ],
4349 }], 4361 }],
4350 ['OS=="ios"', { 4362 ['OS=="ios"', {
4351 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', 4363 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
4352 # Just build armv7, until armv7s is correctly tested. 4364 # Just build armv7, until armv7s is correctly tested.
4353 'VALID_ARCHS': 'armv7 i386', 4365 'VALID_ARCHS': 'armv7 i386',
4354 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', 4366 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
(...skipping 14 matching lines...) Expand all
4369 # settings in target dicts. SYMROOT is a special case, because many other 4381 # settings in target dicts. SYMROOT is a special case, because many other
4370 # Xcode variables depend on it, including variables such as 4382 # Xcode variables depend on it, including variables such as
4371 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4383 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4372 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4384 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4373 # files to appear (when present) in the UI as actual files and not red 4385 # files to appear (when present) in the UI as actual files and not red
4374 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4386 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4375 # and therefore SYMROOT, needs to be set at the project level. 4387 # and therefore SYMROOT, needs to be set at the project level.
4376 'SYMROOT': '<(DEPTH)/xcodebuild', 4388 'SYMROOT': '<(DEPTH)/xcodebuild',
4377 }, 4389 },
4378 } 4390 }
OLDNEW
« no previous file with comments | « no previous file | build/ios/mac_build.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698