libvpx: Fix generated offsets to work with WebView

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 448 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' : {
+        # unpack_lib is used as an input to unpack_lib_posix.gypi.
         'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vp8.a',
+        'unpack_lib_search_path' : '<(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.
-            'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
+            'unpack_lib' : '$(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix))/libvpx_asm_offsets_vp8.a',
+            'unpack_lib_search_path' : '$(abspath <(unpack_lib))',
           }],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',
           }, {
             'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
@@ skipping 16 matching lines @@
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj',
           ],
         }, {
           'variables': {
             'unpack_lib_search_path_list': [
-              '-a', '<(unpack_lib)',
+              '-a', '<(unpack_lib_search_path)',
             ],
             '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' : {
         'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vpx_scale.a',
+        'unpack_lib_search_path' : '<(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.
-            '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' : '$(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix))/libvpx_asm_offsets_vpx_scale.a',
+            'unpack_lib_search_path' : '$(abspath <(unpack_lib))',
           }],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',
           }, {
             'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
@@ skipping 16 matching lines @@
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj',
           ],
         }, {
           'variables': {
             'unpack_lib_search_path_list': [
-              '-a', '<(unpack_lib)',
+              '-a', '<(unpack_lib_search_path)',
             ],
             '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.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }