diff options
| author | fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-28 18:53:38 +0000 |
|---|---|---|
| committer | fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-28 18:53:38 +0000 |
| commit | 0af2b89c9011c96c180faed1416eec76c6ead930 (patch) | |
| tree | 27d3a41775d25542f894bd2e33311bc748290668 | |
| parent | a1058f5eae3938dc0d4fd5dc84b7710a7681c1c0 (diff) | |
| download | libvpx-0af2b89c9011c96c180faed1416eec76c6ead930.tar.gz | |
libvpx: Manually set output dir of gen asm offsets libs.
Force libvpx_asm_offsets_vp8.a and libvpx_asm_offsets_vpx_scale.a
to be built in "shared_generated_dir".
BUG=377062
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/302863004
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@273304 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libvpx.gyp | 20 | ||||
| -rw-r--r-- | unpack_lib_posix.gypi | 2 |
2 files changed, 5 insertions, 17 deletions
@@ -395,6 +395,7 @@ 'type': 'static_library', 'android_unmangled_name': 1, 'hard_dependency': 1, + 'product_dir': '<(shared_generated_dir)', 'include_dirs': [ 'source/config/<(OS_CATEGORY)/<(target_arch_full)', 'source/config', @@ -429,6 +430,7 @@ 'type': 'static_library', 'android_unmangled_name': 1, 'hard_dependency': 1, + 'product_dir': '<(shared_generated_dir)', 'include_dirs': [ 'source/config/<(OS_CATEGORY)/<(target_arch_full)', 'source/config', @@ -460,7 +462,7 @@ 'libvpx_obj_int_extract#host', ], 'variables' : { - 'unpack_lib' : '', + 'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vp8.a', 'output_format':'', 'output_dir': '<(shared_generated_dir)', 'conditions' : [ @@ -469,13 +471,6 @@ # intermediates-dir-for macro. 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a', }], - ['OS=="mac" or OS=="ios"', { - 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.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_vp8.a', - }], ['(target_arch=="arm" or target_arch=="armv7")', { 'output_format': 'gas', }, { @@ -538,7 +533,7 @@ 'libvpx_obj_int_extract#host', ], 'variables' : { - 'unpack_lib' : '', + 'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vpx_scale.a', 'output_format':'', 'output_dir': '<(shared_generated_dir)', 'conditions' : [ @@ -547,13 +542,6 @@ # 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=="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', }, { diff --git a/unpack_lib_posix.gypi b/unpack_lib_posix.gypi index d16ca9c..3d71b3c 100644 --- a/unpack_lib_posix.gypi +++ b/unpack_lib_posix.gypi @@ -31,7 +31,7 @@ { 'variables' : { 'ar_cmd': [], - 'conditions': [ + 'conditions': [ ['android_webview_build==1', { 'ar_cmd': ['-r', '$(abspath $($(gyp_var_prefix)TARGET_AR))'], }], |