summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-28 15:46:10 +0000
committerfgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-28 15:46:10 +0000
commit18772f2ed8de0bf1862ea1fd1bba442262615027 (patch)
treed300a92cfd2d337daa4db74bf01beb00eaddd7dc
parentc8d41e3fbb38a5d0655b5ae7b032a1cfd2a7b615 (diff)
downloadlibvpx-18772f2ed8de0bf1862ea1fd1bba442262615027.tar.gz
libvpx: Update ios generated asm offsets dependencies.
Ios's path to libvpx_asm_offsets_vp8.a was wrong. BUG=377062 TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/305703002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@273250 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--libvpx.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libvpx.gyp b/libvpx.gyp
index 9aa0a74..5bce5e1 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -468,14 +468,14 @@
# pass the empty string for 3rd and 4th arguments of
# intermediates-dir-for macro.
'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
- },],
- ['OS=="mac"', {
+ }],
+ ['OS=="mac" or OS=="ios"', {
'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
- },],
- ['(OS!="win" and OS!="mac")', {
+ }],
+ ['OS!="win" and OS!="mac" and OS!="ios"', {
# <(LIB_DIR) not defined for "win".
'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
- },],
+ }],
['(target_arch=="arm" or target_arch=="armv7")', {
'output_format': 'gas',
}, {