From 7597a85bc47577f9f90353547cc3fe74b8b70dff Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Tue, 22 May 2012 08:32:20 +0000 Subject: [PATCH] Changed merge-name. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/584007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2266 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/build/merge_libs.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/merge_libs.gyp b/src/build/merge_libs.gyp index d23bf11365..d24718918a 100644 --- a/src/build/merge_libs.gyp +++ b/src/build/merge_libs.gyp @@ -27,7 +27,7 @@ { 'variables': { 'output_lib_name': 'webrtc', - 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)_<(target_arch)_<(CONFIGURATION_NAME)<(STATIC_LIB_SUFFIX)', + 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)<(STATIC_LIB_SUFFIX)', }, 'action_name': 'merge_libs', 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)no_op<(EXECUTABLE_SUFFIX)'],