From 3d58cba65bcdd19ba7e70b19a75e103bfebdba74 Mon Sep 17 00:00:00 2001 From: "petarj@mips.com" Date: Fri, 4 Oct 2013 19:31:45 +0000 Subject: [MIPS] Fix library order and includes for breakpad test Add missing header location for linux_dumper_unittest_helper for Android. It is required to correctly locate sgidefs.h. In addition, this change removes duplicate '-ldl', since the order of listed libraries is important for GNU ld (still used for some architectures such as MIPS). BUG= fail to build breakpad tests for MIPS TEST= build breakpad tests MIPS-Android Review URL: https://codereview.chromium.org/26006002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227052 0039d316-1c4b-4281-b951-d872f2087c98 --- breakpad/breakpad.gyp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'breakpad') 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', -- cgit v1.1