diff options
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-12-18 08:38:50 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-12-18 08:38:50 +0000 |
| commit | eaebeb36ae793c3836e96200799b2944cdc7a38c (patch) | |
| tree | b23a33725275b2b7aa444f98af43e4705787accc /third_party | |
| parent | 10abe25f6dcf2d6a3ff579ecc3101d97bad8f605 (diff) | |
| download | webrtc-eaebeb36ae793c3836e96200799b2944cdc7a38c.tar.gz | |
Without specifying the input files the offsets will not automatically be regenerated when building for different architectures. That is very risky as it will cause crashes rather than build errors.
TEST=trybots
BUG=1185
Review URL: https://webrtc-codereview.appspot.com/975006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3303 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libvpx/libvpx.gyp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index c712b8ff0c..b63bef3550 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -426,8 +426,18 @@ { # Take archived .a file and unpack it unto .o files. 'action_name': 'unpack_lib_posix', + 'variables': { + 'conditions': [ + ['OS=="mac"', { + 'libvpx_asm_offset_a': '<(LIB_DIR)/libvpx_asm_offsets.a', + }, { + 'libvpx_asm_offset_a': '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets.a', + }], + ], + }, 'inputs': [ 'unpack_lib_posix.sh', + '<(libvpx_asm_offset_a)', ], 'outputs': [ '<(INTERMEDIATE_DIR)/asm_com_offsets.o', @@ -437,8 +447,7 @@ 'action': [ '<(DEPTH)/third_party/libvpx/unpack_lib_posix.sh', '-d', '<(INTERMEDIATE_DIR)', - '-a', '<(LIB_DIR)/libvpx_asm_offsets.a', - '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets.a', + '-a', '<(libvpx_asm_offset_a)', '-f', 'asm_com_offsets.o', '-f', 'asm_dec_offsets.o', '-f', 'asm_enc_offsets.o', |