Index: libvpx.gyp |
diff --git a/libvpx.gyp b/libvpx.gyp |
index 9fce1083420f278ee02b8ae6251a9471c0df6911..2a065ae2522f76957039cff656e1a59dce6e1855 100644 |
--- a/libvpx.gyp |
+++ b/libvpx.gyp |
@@ -13,7 +13,7 @@ |
], |
}, |
'conditions': [ |
- [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', { |
+ [ 'OS != "android" and target_arch != "arm"', { |
'targets': [ |
{ |
# This libvpx target contains both encoder and decoder. |
@@ -22,8 +22,17 @@ |
'type': 'static_library', |
'variables': { |
'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', |
+ 'variables': { |
+ 'conditions': [ |
+ ['os_posix == 1 and OS != "mac"', { |
+ '_OS%': 'linux', |
Ami GONE FROM CHROMIUM
2011/11/23 09:14:11
I'm shocked that reusing the linux config happens
ruben
2011/11/23 10:07:41
The linux and mac ia32 configs only differ by 6 li
Ami GONE FROM CHROMIUM
2011/11/23 17:03:39
It would be interesting to know whether the other
ruben
2011/11/23 18:55:53
The library is only compiled at this point, so no
Ami GONE FROM CHROMIUM
2011/11/23 19:09:43
FTR chromium switched from libvpx to ffvp8 for vid
ruben
2011/11/23 19:33:12
Yeah, after you mentioned it earlier, I checked th
|
+ }, { |
+ '_OS%': '<(OS)', |
+ }], |
+ ]}, |
+ '_OS%': '<(_OS)', |
'yasm_flags': [ |
- '-I', 'source/config/<(OS)/<(target_arch)', |
+ '-I', 'source/config/<(_OS)/<(target_arch)', |
'-I', 'source/libvpx', |
], |
}, |
@@ -31,7 +40,7 @@ |
'../yasm/yasm_compile.gypi' |
], |
'include_dirs': [ |
- 'source/config/<(OS)/<(target_arch)', |
+ 'source/config/<(_OS)/<(target_arch)', |
'source/libvpx', |
'source/libvpx/vp8/common', |
'source/libvpx/vp8/decoder', |