Index: libvpx.gyp |
diff --git a/libvpx.gyp b/libvpx.gyp |
index b043b2441644c26d7be83b5d4b6c79d1a5a627a7..e9e66ec464fda6b19ff973dd7e1d7c5e05b10dfd 100644 |
--- a/libvpx.gyp |
+++ b/libvpx.gyp |
@@ -225,53 +225,8 @@ |
'target_name': 'libvpx', |
'type': 'static_library', |
- # Copy the script to the output folder so that we can use it with |
- # absolute path. |
- 'copies': [{ |
- 'destination': '<(shared_generated_dir)', |
- 'files': [ |
- '<(ads2gas_script_path)', |
- '<(ads2gas_script_include)', |
- ], |
- }], |
- |
- # Rule to convert .asm files to .S files. |
- 'rules': [ |
- { |
- 'rule_name': 'convert_asm', |
- 'extension': 'asm', |
- 'inputs': [ |
- '<(shared_generated_dir)/<(ads2gas_script)', |
- '<(shared_generated_dir)/thumb.pm', |
- ], |
- 'outputs': [ |
- '<(shared_generated_dir)/<(RULE_INPUT_ROOT).S', |
- ], |
- 'action': [ |
- 'bash', |
- '-c', |
- 'cat <(RULE_INPUT_PATH) | perl <(shared_generated_dir)/<(ads2gas_script) -chromium > <(shared_generated_dir)/<(RULE_INPUT_ROOT).S', |
- ], |
- 'process_outputs_as_sources': 1, |
- 'message': 'Convert libvpx asm file for ARM <(RULE_INPUT_PATH)', |
- }, |
- ], |
+ 'includes': [ 'ads2gas.gypi', ], |
- 'variables': { |
- 'variables': { |
- 'conditions': [ |
- ['OS=="ios"', { |
- 'ads2gas_script%': 'ads2gas_apple.pl', |
- }, { |
- 'ads2gas_script%': 'ads2gas.pl', |
- }], |
- ], |
- }, |
- 'ads2gas_script%': '<(ads2gas_script)', |
- # Location of the assembly conversion script. |
- 'ads2gas_script_path': '<(libvpx_source)/build/make/<(ads2gas_script)', |
- 'ads2gas_script_include': '<(libvpx_source)/build/make/thumb.pm', |
- }, |
'xcode_settings': { |
'OTHER_CFLAGS': [ |
'-I<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)', |
@@ -300,9 +255,6 @@ |
'dependencies': [ |
'libvpx_intrinsics_neon', |
], |
- 'cflags': [ |
- '-Wa,-mfpu=neon', |
- ], |
}, { |
'includes': [ |
'libvpx_srcs_arm.gypi', |