commit cf42f62aae8cb9c9e0ed021ee6985affbe118677
author rtoy@google.com <rtoy@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 29 18:00:13 2014
committer rtoy@google.com <rtoy@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 29 18:00:13 2014
tree ce2dc4e65e5ad522f36606b7cdb16acb7f8baccd
parent 5537f70dff0bb4566ebb1ec645d2020974e93493

Fix openmax_dl build for Android WebView.

WebView cannot rely on cpufeatures from the NDK.

BUG=368240
R=andrew@webrtc.org, rtoy@google.com

Review URL: https://webrtc-codereview.appspot.com/12449004

git-svn-id: http://webrtc.googlecode.com/svn/deps/third_party/openmax@6024 4adac7df-926f-26a2-2b94-8c16560cd09d

dl/dl.gyp

diff --git a/dl/dl.gyp b/dl/dl.gyp
index 7fd7665..a1953a7 100644
--- a/dl/dl.gyp
+++ b/dl/dl.gyp
@@ -159,15 +159,15 @@
           # standalone. Applications must link with openmax_dl.
           'target_name': 'openmax_dl_armv7',
           'type': 'static_library',
+          'includes': [
+            '../../../build/android/cpufeatures.gypi',
+          ],
           'include_dirs': [
             '../',
           ],
           'cflags!': [
             '-mfpu=neon',
           ],
-          'dependencies': [
-            '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features',
-          ],
           'link_settings' : {
             'libraries': [
               # To get the __android_log_print routine