generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix generate_asm_header.

Browse Source 
In gyp, "inputs" always takes path relative to the gyp file.
The path in "action" is absolute since it can be included from a different directory.
Review URL: https://webrtc-codereview.appspot.com/965026

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3100 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wjia@webrtc.org 2012-11-15 00:13:07 +00:00
parent 50419b0777
commit aea2510b8d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/build/generate_asm_header.gypi
View File

@ -30,7 +30,6 @@
# TODO(kma): port this block from Android into other build systems. # TODO(kma): port this block from Android into other build systems.
{ {
'variables': { 'variables': {
'gen_header': '<(DEPTH)/webrtc/build/generate_asm_header.py',
'out_dir': '<(SHARED_INTERMEDIATE_DIR)/<(asm_header_dir)', 'out_dir': '<(SHARED_INTERMEDIATE_DIR)/<(asm_header_dir)',
'process_outputs_as_sources': 1, 'process_outputs_as_sources': 1,
}, },
@ -39,14 +38,14 @@
'rule_name': 'generate_asm_header', 'rule_name': 'generate_asm_header',
'extension': 'c', 'extension': 'c',
'inputs': [ 'inputs': [
'<(gen_header)', 'generate_asm_header.py',
], ],
'outputs': [ 'outputs': [
'<(out_dir)/<(RULE_INPUT_ROOT).h', '<(out_dir)/<(RULE_INPUT_ROOT).h',
], ],
'action': [ 'action': [
'python', 'python',
'<(gen_header)', '<(webrtc_root)/build/generate_asm_header.py',
'--compiler=<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ' '--compiler=<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} '
'<(android_toolchain)/*-gcc)', '<(android_toolchain)/*-gcc)',
'--options=-I.. -I<@(android_ndk_include) -S', # Compiler options. '--options=-I.. -I<@(android_ndk_include) -S', # Compiler options.