diff options
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/breakpad.gyp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 482fcd1..a5af1aa 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -504,14 +504,18 @@ 'src/common/android/breakpad_getcontext.S', ], }], + ['OS!="android"', { + 'link_settings': { + 'libraries': [ + # In case of Android, '-ldl' is added in common.gypi, since it + # is needed for stlport_static. For LD, the order of libraries + # is important, and thus we skip to add it here. + '-ldl', + ], + }, + }], ], - 'link_settings': { - 'libraries': [ - '-ldl', - ], - }, - 'include_dirs': [ 'src', 'src/client', @@ -621,6 +625,13 @@ 'src', '..', ], + 'conditions': [ + ['target_arch=="mipsel" and OS=="android"', { + 'include_dirs': [ + 'src/common/android/include', + ], + }], + ], }, { 'target_name': 'generate_test_dump', |