| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 8f479d71a3977abef592bd781e8232eb0b972075..c4123acd530922624eb268a1a834ab5a5bb075ea 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3982,17 +3982,22 @@
|
| },
|
| },
|
| },
|
| - 'xcode_settings': {
|
| - 'conditions': [
|
| - ['chromium_ios_signing', {
|
| - # iOS SDK wants everything for device signed.
|
| - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
|
| - }, {
|
| - 'CODE_SIGNING_REQUIRED': 'NO',
|
| - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
|
| - }],
|
| - ],
|
| - },
|
| + 'conditions': [
|
| + # TODO(justincohen): ninja builds don't support signing yet.
|
| + ['"<(GENERATOR)"!="ninja"', {
|
| + 'xcode_settings': {
|
| + 'conditions': [
|
| + ['chromium_ios_signing', {
|
| + # iOS SDK wants everything for device signed.
|
| + 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
|
| + }, {
|
| + 'CODE_SIGNING_REQUIRED': 'NO',
|
| + 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
|
| + }],
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| }],
|
| ], # target_conditions
|
| }, # target_defaults
|
| @@ -4341,7 +4346,14 @@
|
| ['OS=="ios"', {
|
| 'conditions': [
|
| ['ios_sdk_path==""', {
|
| - 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot
|
| + 'conditions': [
|
| + # TODO(justincohen): Ninja only supports simulator for now.
|
| + ['"<(GENERATOR)"=="ninja"', {
|
| + 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot
|
| + }, {
|
| + 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot
|
| + }],
|
| + ],
|
| }, {
|
| 'SDKROOT': '<(ios_sdk_path)', # -isysroot
|
| }],
|
|
|