libvpx: Change 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 377 matching lines @@
           'include_dirs': [ 'include' ],
         }],
       ],
     },
     {
       # A library that contains assembly offsets needed.
       'target_name': 'libvpx_asm_offsets_vp8',
       'type': 'static_library',
       'android_unmangled_name': 1,
       'hard_dependency': 1,
-      'product_dir': '<(shared_generated_dir)',
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
         'source/config',
         '<(libvpx_source)',
       ],
       'conditions': [
         ['asan==1', {
           'cflags!': [ '-fsanitize=address' ],
           'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] },
           'ldflags!': [ '-fsanitize=address' ],
         }],
         ['OS=="win"', {
           'msvs_settings': {
             'VCCLCompilerTool': {
               # Clang uses -fdata-sections when function level linking is
               # enabled, but libvpx_obj_int_extract expects all data to
               # reside in the same section on Windows.
               'EnableFunctionLevelLinking': 'false',
             },
           },
         }],
-        ['android_webview_build==1', {
-          'product_dir' : '',
+        ['android_webview_build==0', {
+          'product_dir': '<(shared_generated_dir)',
         }],
       ],
       'sources': [
         '<(libvpx_source)/vp8/encoder/vp8_asm_enc_offsets.c',
       ],
     },
     {
       # A library that contains assembly offsets needed.
       # TODO(fgalligan): Merge libvpx_asm_offsets_vpx_scale into
       # libvpx_asm_offsets.
       'target_name': 'libvpx_asm_offsets_vpx_scale',
       'type': 'static_library',
       'android_unmangled_name': 1,
       'hard_dependency': 1,
-      'product_dir': '<(shared_generated_dir)',
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
         'source/config',
         '<(libvpx_source)',
       ],
       'conditions': [
         ['asan==1', {
           'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ],
           'xcode_settings': {
             'OTHER_CFLAGS!': [ '-faddress-sanitizer','-fsanitize=address' ],
           },
           'ldflags!': [ '-faddress-sanitizer', '-fsanitize=address', ],
         }],
-        ['android_webview_build==1', {
-          'product_dir' : '',
+        ['android_webview_build==0', {
+          'product_dir': '<(shared_generated_dir)',
         }],
       ],
       'sources': [
         '<(libvpx_source)/vpx_scale/vpx_scale_asm_offsets.c',
       ],
     },
     {
       # A target that takes assembly offsets library and generate the
       # corresponding assembly files.
       # This target is a hard dependency because the generated .asm files
@@ skipping 130 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'],
     },
   ],
 }