Chromium Code Reviews| Index: libvpx.gyp |
| diff --git a/libvpx.gyp b/libvpx.gyp |
| index 9fce1083420f278ee02b8ae6251a9471c0df6911..4407dc6913e4f460fc0437b42bd829e122ff7155 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,19 @@ |
| 'type': 'static_library', |
| 'variables': { |
| 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', |
| + 'variables': { |
| + 'conditions': [ |
| + # Reuse linux config for unsupported platforms like BSD and |
| + # Solaris. This compiles but no guarantee it'll run. |
|
bradn
2011/12/02 01:18:01
Other than maybe selecting a more descriptive name
|
| + ['os_posix == 1 and OS != "mac"', { |
| + '_OS%': 'linux', |
| + }, { |
| + '_OS%': '<(OS)', |
| + }], |
| + ]}, |
| + '_OS%': '<(_OS)', |
| 'yasm_flags': [ |
| - '-I', 'source/config/<(OS)/<(target_arch)', |
| + '-I', 'source/config/<(_OS)/<(target_arch)', |
| '-I', 'source/libvpx', |
| ], |
| }, |
| @@ -31,7 +42,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', |