From 00c18dbccadd518a2aab698fc2aff8d700f95dc2 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Wed, 16 Jan 2013 22:56:08 +0000 Subject: [PATCH] Fix libvpx for Android Android writes .a files to a different directory so update it accordingly. BUG=1294 TEST=Builds on Android Review URL: https://webrtc-codereview.appspot.com/1013013 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3377 4adac7df-926f-26a2-2b94-8c16560cd09d --- third_party/libvpx/libvpx.gyp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index a13e97520..36637bc3a 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -421,20 +421,20 @@ '<(INTERMEDIATE_DIR)/asm_dec_offsets.obj', '<(INTERMEDIATE_DIR)/asm_enc_offsets.obj', ], - }, { + }, { # OS != "win" + 'variables': { + 'conditions': [ + ['OS=="mac" or OS=="android"', { + 'libvpx_asm_offset_a': '<(PRODUCT_DIR)/libvpx_asm_offsets.a', + }, { + 'libvpx_asm_offset_a': '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets.a', + }], + ], + }, 'actions': [ { # 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)',