generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix libvpx for Android

Browse Source 
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
This commit is contained in:
hclam@chromium.org 2013-01-16 22:56:08 +00:00
parent 2fd947fb21
commit 00c18dbcca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
third_party/libvpx/libvpx.gyp vendored
View File

@ -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)',