| Index: breakpad/breakpad.gyp
|
| diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
|
| index 1046c74ad28ce191e61e8026707f66a9aaedd5c4..2e2e7099a79ad92a226592bc54633ea5763ecfca 100644
|
| --- a/breakpad/breakpad.gyp
|
| +++ b/breakpad/breakpad.gyp
|
| @@ -10,7 +10,7 @@
|
| 'conditions': [
|
| # minidump_stackwalk and minidump_dump are tool-type executables that do
|
| # not build on iOS with Xcode (but do build on iOS with ninja.)
|
| - ['(OS!="ios" or "<(GENERATOR)"=="ninja") and OS!="win"', {
|
| + ['(OS!="ios" or "<(GENERATOR)"!="xcode") and OS!="win"', {
|
| 'targets': [
|
| {
|
| # code shared by both {micro,mini}dump_stackwalk
|
| @@ -164,7 +164,7 @@
|
| },
|
| ],
|
| }],
|
| - ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"=="ninja")', {
|
| + ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"!="xcode")', {
|
| 'target_defaults': {
|
| 'include_dirs': [
|
| 'src',
|
| @@ -851,7 +851,7 @@
|
| }
|
| ]
|
| }],
|
| - ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
|
| + ['OS=="ios" and "<(GENERATOR)"=="xcode"', {
|
| 'variables': {
|
| 'ninja_output_dir': 'ninja-breakpad',
|
| 'ninja_product_dir':
|
|
|