Index: libvpx.gyp |
diff --git a/libvpx.gyp b/libvpx.gyp |
index 064f603d7f9188f935181c242658019a80324876..579b686124742cf0e55a1d2dcfbdd349a8541788 100644 |
--- a/libvpx.gyp |
+++ b/libvpx.gyp |
@@ -293,17 +293,11 @@ |
# .include directive files from the place where they're |
# generated to. |
'cflags': [ |
- '-Wa,-I,<(shared_generated_dir)', |
+ '-Wa,-I,<(shared_generated_dir)', |
+ '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', |
+ '-Wa,-I,<!(pwd)/source/config', |
], |
'conditions': [ |
- # For Android WebView, the following pathc are not required and not |
- # allowed, because they generate the absolute path. |
- ['android_webview_build!=1', { |
- 'cflags': [ |
- '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', |
- '-Wa,-I,<!(pwd)/source/config', |
- ], |
- }], |
# Libvpx optimizations for ARMv6 or ARMv7 without NEON. |
['arm_neon==0', { |
'conditions': [ |
@@ -331,8 +325,8 @@ |
], |
}], |
['OS == "android"', { |
- 'includes': [ |
- '../../build/android/cpufeatures.gypi', |
+ 'dependencies': [ |
+ '../../build/android/ndk.gyp:cpu_features', |
], |
}], |
['OS == "ios"', { |