From eaebeb36ae793c3836e96200799b2944cdc7a38c Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Tue, 18 Dec 2012 08:38:50 +0000 Subject: [PATCH] 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 --- third_party/libvpx/libvpx.gyp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index c712b8ff0..b63bef355 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',