From 5bdfe0248c5260a2043db5e917f706b70d007eac Mon Sep 17 00:00:00 2001 From: "torne@chromium.org" Date: Wed, 21 Nov 2012 15:55:15 +0000 Subject: Android WebView: fix linking cpufeatures. The library dependency on cpufeatures.a from libwebp doesn't get propagated correctly; work around this for now by forcing it to be linked into the .so explicitly. BUG= Review URL: https://codereview.chromium.org/11412130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169048 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/android_webview.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'android_webview/android_webview.gyp') diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 1582ebb..6f56437 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -23,6 +23,15 @@ 'sources': [ 'lib/main/webview_entry_point.cc', ], + 'conditions': [ + ['android_build_type != 0', { + 'libraries': [ + # The "android" gyp backend doesn't quite handle static libraries' + # dependencies correctly; force this to be linked as a workaround. + 'cpufeatures.a', + ], + }], + ], }, { 'target_name': 'android_webview_common', -- cgit v1.1