From a19b930b5bda8e0ac2048ef30fe9fdd293d512b6 Mon Sep 17 00:00:00 2001 From: "fgalligan@google.com" Date: Wed, 18 Jun 2014 19:20:45 +0000 Subject: [PATCH] Update webrtc to fix unpack_lib expansion. Add on fix for:https://webrtc-codereview.appspot.com/12789004/ *NOTE* This CL will break the Android bots as they are built in a Chromium checkout, which will pull in old libvpx DEPS. They will cycle to green when we roll libvpx into Chromium. We must do the rolls in this order because we have to land webrtc and libvpx at the same time into Chromium. BUG=377062 TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20729004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6482 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_processing/lib_core_neon_offsets.gypi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi b/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi index 1dd0a2ef96..64a7a21963 100644 --- a/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi +++ b/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi @@ -10,20 +10,18 @@ # and gen_core_neon_offsets_chromium.gyp { 'variables': { - 'unpack_lib': '<(shared_generated_dir)/lib_core_neon_offsets.a', - 'unpack_lib_search_path' : '<(shared_generated_dir)/lib_core_neon_offsets.a', 'conditions' : [ ['android_webview_build==1', { 'unpack_lib' : '$(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix))/lib_core_neon_offsets.a', - 'unpack_lib_search_path' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a', + 'unpack_lib_search_path_list' : ['-a', '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a'], + }, { + 'unpack_lib': '<(shared_generated_dir)/lib_core_neon_offsets.a', + 'unpack_lib_search_path_list' : ['-a', '<(shared_generated_dir)/lib_core_neon_offsets.a'], }], ], 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets', 'output_dir': '<(shared_generated_dir)', 'output_format': 'cheader', - 'unpack_lib_search_path_list': [ - '-a', '<(unpack_lib_search_path)', - ], 'object_file_output_dir':'<(shared_generated_dir)', }, 'includes': [