From df94329a4b76f5d5333410ce38a8a5361d98298e Mon Sep 17 00:00:00 2001 From: "wjia@webrtc.org" Date: Wed, 5 Dec 2012 22:54:52 +0000 Subject: [PATCH] Use different cpufeatures library when building with chrome. There are more than one target when building with chrome. They have different build setup. This patch just puts content of build/android/cpufeatures.gypi inside system_wrappers.gyp. In the future, if more modules will use cpufeatures lib, we can move the code into a gypi file. Review URL: https://webrtc-codereview.appspot.com/939030 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3242 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/source/system_wrappers.gyp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 67bf7b5ce..1d4d76435 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -209,8 +209,16 @@ ], 'conditions': [ ['build_with_chromium==1', { - 'dependencies': [ - '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', + 'conditions': [ + ['android_build_type != 0', { + 'libraries': [ + 'cpufeatures.a' + ], + }, { + 'dependencies': [ + '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', + ], + }], ], }, { 'sources': [