Use target_arch_full consistently

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 48 matching lines @@
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
           'target_name': 'libvpx',
           'type': 'static_library',
           '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)',
+              '-I', 'source/config/<(OS_CATEGORY)/<(target_arch_full)',
               '-I', 'source/config',
               '-I', '<(libvpx_source)',
               '-I', '<(shared_generated_dir)', # Generated assembly offsets
             ],
           },
           'dependencies': [
             'gen_asm_offsets_vp8',
           ],
           'includes': [
             '../yasm/yasm_compile.gypi'
           ],
           'include_dirs': [
-            'source/config/<(OS_CATEGORY)/<(target_arch)',
+            'source/config/<(OS_CATEGORY)/<(target_arch_full)',
             'source/config',
             '<(libvpx_source)',
             '<(libvpx_source)/vp8/common',
             '<(libvpx_source)/vp8/decoder',
             '<(libvpx_source)/vp8/encoder',
             '<(shared_generated_dir)', # Provides vpx_rtcd.h.
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(libvpx_source)',
@@ skipping 79 matching lines @@
             'shared_generated_dir':
               '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
           },
           'includes': [
             'libvpx_srcs_mips.gypi',
           ],
           'cflags': [
             '-EL -static -mips32',
           ],
           'include_dirs': [
-            'source/config/<(OS_CATEGORY)/<(target_arch)',
+            'source/config/<(OS_CATEGORY)/<(target_arch_full)',
             'source/config',
             '<(libvpx_source)',
             '<(libvpx_source)/vp8/common',
             '<(libvpx_source)/vp8/decoder',
             '<(libvpx_source)/vp8/encoder',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(libvpx_source)',
             ],
           },
           'sources': [
-            'source/config/<(OS_CATEGORY)/<(target_arch)/vpx_config.c',
+            'source/config/<(OS_CATEGORY)/<(target_arch_full)/vpx_config.c',
           ],
         },
       ],
     },
     ],
     # 'libvpx' target for ARM builds.
     [ '(target_arch=="arm" or target_arch=="armv7") ', {
       'targets': [
         {
           # This libvpx target contains both encoder and decoder.
@@ skipping 322 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'],
     },
   ],
 }