Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: libvpx.gyp

Issue 298383003: libvpx: Fix vpxscale asm offsets dependencies for ios. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libvpx.gyp
===================================================================
--- libvpx.gyp (revision 273250)
+++ libvpx.gyp (working copy)
@@ -546,10 +546,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_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_scale.a',
- },],
- ['OS!="win"', {
+ }],
+ ['OS=="mac" or OS=="ios"', {
+ 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vpx_scale.a',
+ }],
+ ['OS!="win" and OS!="mac" and OS!="ios"', {
+ # <(LIB_DIR) not defined for "win".
'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
- },],
+ }],
['(target_arch=="arm" or target_arch=="armv7")', {
'output_format': 'gas',
}, {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698