libvpx: Fix generated asm offsets.

libvpx.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
@@ skipping 70 matching lines @@
           'variables': {
             'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
             'OS_CATEGORY%': '<(OS_CATEGORY)',
             'yasm_flags': [
               '-D', 'CHROMIUM',
               '-I', 'source/config/<(OS_CATEGORY)/<(target_arch_full)',
               '-I', 'source/config',
               '-I', '<(libvpx_source)',
               '-I', '<(shared_generated_dir)', # Generated assembly offsets
             ],
+            'yasm_includes': [
+              '<(shared_generated_dir)/vp8_asm_enc_offsets.asm'
+            ],
           },
           'dependencies': [
             'gen_asm_offsets_vp8',
           ],
           'includes': [
             '../yasm/yasm_compile.gypi'
           ],
           'include_dirs': [
             'source/config/<(OS_CATEGORY)/<(target_arch_full)',
             'source/config',
@@ skipping 143 matching lines @@
           }],
 
           # 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',
+                '<(shared_generated_dir)/vp8_asm_enc_offsets.asm',
               ],
               '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,
@@ skipping 185 matching lines @@
       # This target is a hard dependency because the generated .asm files
       # are needed all assembly optimized files in libvpx.
       'target_name': 'gen_asm_offsets_vp8',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'libvpx_asm_offsets_vp8',
         'libvpx_obj_int_extract#host',
       ],
       'variables' : {
-        'lib_intermediate_name' : '',
+        'unpack_lib' : '',
         'output_format':'',
         'output_dir': '<(shared_generated_dir)',
         'conditions' : [
           ['android_webview_build==1', {
             # pass the empty string for 3rd and 4th arguments of
             # intermediates-dir-for macro.
-            'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
-          }],
+            'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
+          }, {
+            'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
+          },],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',
           }, {
             'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'variables': {
             'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/<(libvpx_source)/vp8',
           },
           'actions': [
             {
               'action_name': 'copy_enc_offsets_obj',
-              'inputs': [ 'copy_obj.py' ],
+              'inputs': [ '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj' ],
               'outputs': [ '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj' ],
               'action': [
                 'python',
                 '<(DEPTH)/third_party/libvpx/copy_obj.py',
                 '-d', '<@(_outputs)',
-                '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj',
                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
-                '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj',
           ],
         }, {
           'variables': {
             'unpack_lib_search_path_list': [
-              '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
-              '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
-              '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vp8.a',
-              '-a', '<(lib_intermediate_name)',
+              '-a', '<(unpack_lib)',
             ],
-            'unpack_lib_output_dir':'<(INTERMEDIATE_DIR)',
-            'unpack_lib_name':'vp8_asm_enc_offsets.o'
+            'object_file_output_dir':'<(INTERMEDIATE_DIR)',
+            'object_file_to_extract':'vp8_asm_enc_offsets.o'
           },
           'includes': ['unpack_lib_posix.gypi'],
           # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
     {
       # A target that takes assembly offsets library and generate the
       # corresponding assembly files.
       # This target is a hard dependency because the generated .asm files
       # are needed all assembly optimized files in libvpx.
       'target_name': 'gen_asm_offsets_vpx_scale',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'libvpx_asm_offsets_vpx_scale',
         'libvpx_obj_int_extract#host',
       ],
       'variables' : {
-        'lib_intermediate_name' : '',
+        'unpack_lib' : '',
         'output_format':'',
         'output_dir': '<(shared_generated_dir)',
         'conditions' : [
           ['android_webview_build==1', {
             # pass the empty string for 3rd and 4th arguments of
             # intermediates-dir-for macro.
-            'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_scale.a',
-          }],
+            'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_scale.a',
+          }, {
+            'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
+          },],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',
           }, {
             'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'variables': {
             'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/<(libvpx_source)/vpx_scale',
           },
           'actions': [
             {
               'action_name': 'copy_enc_offsets_obj',
-              'inputs': [ 'copy_obj.py' ],
+              'inputs': [ '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj' ],
               'outputs': [ '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj' ],
               'action': [
                 'python',
                 '<(DEPTH)/third_party/libvpx/copy_obj.py',
                 '-d', '<@(_outputs)',
-                '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj',
                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
-                '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj',
           ],
         }, {
           'variables': {
             'unpack_lib_search_path_list': [
-              '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vpx_scale.a',
-              '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
-              '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
-              '-a', '<(lib_intermediate_name)',
+              '-a', '<(unpack_lib)',
             ],
-            'unpack_lib_output_dir':'<(INTERMEDIATE_DIR)',
-            'unpack_lib_name':'vpx_scale_asm_offsets.o'
+            'object_file_output_dir':'<(INTERMEDIATE_DIR)',
+            'object_file_to_extract':'vpx_scale_asm_offsets.o'
           },
           'includes': ['unpack_lib_posix.gypi'],
-         # Need this otherwise gyp won't run the rule on them.
+          # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }