Use the new gyp_var_prefix local variable set by gyp instead of the

global GYP_VAR_PREFIX set by the makefiles, since the latter is not
guaranteed to still be the same value at the time the command is
executed. Also, use abspath instead of realpath to convert paths to
absolute, since realpath expands to the empty string if the target file
doesn't exist, complicating build debugging.

BUG=
R=andrew@webrtc.org, torne@chromium.org

Review URL: https://webrtc-codereview.appspot.com/12559004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6186 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
michaelbai@google.com 2014-05-16 17:56:10 +00:00
parent 14abcc7322
commit 725e582461

View File

@ -14,7 +14,7 @@
'lib_intermediate_name': '',
'conditions' : [
['android_webview_build==1', {
'lib_intermediate_name' : '$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX)))/lib_core_neon_offsets.a',
'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a',
}],
],
},