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

Unified Diff: libvpx.gyp

Issue 346563002: libvpx: Really, fix generated offsets to work with WebView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 6 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 278058)
+++ libvpx.gyp (working copy)
@@ -468,7 +468,7 @@
'variables' : {
# unpack_lib is used as an input to unpack_lib_posix.gypi.
'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vp8.a',
- 'unpack_lib_search_path' : '<(unpack_lib)',
+ 'unpack_lib_search_path' : '<(shared_generated_dir)/libvpx_asm_offsets_vp8.a',
'output_format':'',
'output_dir': '<(shared_generated_dir)',
'conditions' : [
@@ -476,7 +476,7 @@
# pass the empty string for 3rd and 4th arguments of
# intermediates-dir-for macro.
'unpack_lib' : '$(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix))/libvpx_asm_offsets_vp8.a',
- 'unpack_lib_search_path' : '$(abspath <(unpack_lib))',
+ 'unpack_lib_search_path' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
}],
['(target_arch=="arm" or target_arch=="armv7")', {
'output_format': 'gas',
@@ -541,7 +541,7 @@
],
'variables' : {
'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vpx_scale.a',
- 'unpack_lib_search_path' : '<(unpack_lib)',
+ 'unpack_lib_search_path' : '<(shared_generated_dir)/libvpx_asm_offsets_vpx_scale.a',
'output_format':'',
'output_dir': '<(shared_generated_dir)',
'conditions' : [
@@ -549,7 +549,7 @@
# pass the empty string for 3rd and 4th arguments of
# intermediates-dir-for macro.
'unpack_lib' : '$(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix))/libvpx_asm_offsets_vpx_scale.a',
- 'unpack_lib_search_path' : '$(abspath <(unpack_lib))',
+ 'unpack_lib_search_path' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.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