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

Unified Diff: breakpad/breakpad.gyp

Issue 26006002: [MIPS] Fix library order and includes for breakpad test (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: breakpad/breakpad.gyp
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 482fcd1861aeedbe19b4d1f7b2eb76a0225953a0..a5af1aa23f745be067bcfddab1578edf65aa7832 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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698