libvpx: Update mac and win generated asm offsets dependencies.

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 450 matching lines @@
       ],
       'variables' : {
         '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',
-          }, {
+          },],
+          ['OS=="mac"', {
+            'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
+          },],
+          ['(OS!="win" and OS!="mac")', {
+            # <(LIB_DIR) not defined for "win".
             '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', 
+                'copy_obj.py',
                 '<(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', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
               ],
               'process_output_as_sources': 1,
@@ skipping 33 matching lines @@
       ],
       'variables' : {
         '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',
-          }, {
+          },],
+          ['OS!="win"', {
             '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', 
+                'copy_obj.py',
                 '<(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', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
               ],
               'process_output_as_sources': 1,
@@ skipping 14 matching lines @@
           # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }