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': [