diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-16 21:08:48 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-16 21:08:48 +0000 |
| commit | 1bb0ad065f0207d3e3c98df44deea3e5afd45e15 (patch) | |
| tree | 4fc91f15364df390e5f2ef0e9e5897b7a7933ea6 | |
| parent | 7765c078fa920ba6c949c15f16b6cc979d8bb95b (diff) | |
| download | libvpx-1bb0ad065f0207d3e3c98df44deea3e5afd45e15.tar.gz | |
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.
Removed 2 include paths from WebView build, they are not used in WebView,
but generate full path which shouldn't in android make file.
BUG=
R=johannkoenig@google.com, torne@chromium.org
Review URL: https://codereview.chromium.org/288293002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@271093 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libvpx.gyp | 28 | ||||
| -rw-r--r-- | unpack_lib_posix.gypi | 2 |
2 files changed, 18 insertions, 12 deletions
@@ -53,7 +53,7 @@ 'variables': { 'conditions': [ ['OS=="win" and buildtype=="Official"', { - # Do not set to 'size', as it results in an error on win64. + # Do not set to 'size', as it results in an error on win64. 'optimize' :'speed', }], ], @@ -280,14 +280,6 @@ 'ads2gas_script_path': '<(libvpx_source)/build/make/<(ads2gas_script)', 'ads2gas_script_include': '<(libvpx_source)/build/make/thumb.pm', }, - # We need to explicitly tell the assembler to look for - # .include directive files from the place where they're - # generated to. - 'cflags': [ - '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', - '-Wa,-I,<!(pwd)/source/config', - '-Wa,-I,<(shared_generated_dir)', - ], 'xcode_settings': { 'OTHER_CFLAGS': [ '-I<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', @@ -305,7 +297,21 @@ '<(libvpx_source)', ], }, + # We need to explicitly tell the assembler to look for + # .include directive files from the place where they're + # generated to. + 'cflags': [ + '-Wa,-I,<(shared_generated_dir)', + ], 'conditions': [ + # For Android WebView, the following pathc are not required and not + # allowed, because they generate the absolute path. + ['android_webview_build!=1', { + 'cflags': [ + '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', + '-Wa,-I,<!(pwd)/source/config', + ], + }], # Libvpx optimizations for ARMv6 or ARMv7 without NEON. ['arm_neon==0', { 'conditions': [ @@ -457,7 +463,7 @@ ['android_webview_build==1', { # pass the empty string for 3rd and 4th arguments of # intermediates-dir-for macro. - 'lib_intermediate_name' : '$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8,,, $(GYP_VAR_PREFIX)))/libvpx_asm_offsets_vp8.a', + 'lib_intermediate_name' : '$(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', @@ -530,7 +536,7 @@ ['android_webview_build==1', { # pass the empty string for 3rd and 4th arguments of # intermediates-dir-for macro. - 'lib_intermediate_name' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vpx_scale,,, $(GYP_VAR_PREFIX))/libvpx_asm_offsets_vpx_scale.a', + 'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/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 3716314..f26ea13 100644 --- a/unpack_lib_posix.gypi +++ b/unpack_lib_posix.gypi @@ -30,7 +30,7 @@ 'ar_cmd': [], 'conditions': [ ['android_webview_build==1', { - 'ar_cmd': ['-r', '$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))'], + 'ar_cmd': ['-r', '$(abspath $($(gyp_var_prefix)TARGET_AR))'], }], ], }, |