| OLD | NEW | 
 | (Empty) | 
|    1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |  | 
|    2 # Use of this source code is governed by a BSD-style license that can be |  | 
|    3 # found in the LICENSE file. |  | 
|    4  |  | 
|    5 # TODO(bradchen): eliminate need for the warning flag removals below |  | 
|    6 { |  | 
|    7   'includes': [ |  | 
|    8     '../../../build/common.gypi', |  | 
|    9   ], |  | 
|   10   'target_defaults': { |  | 
|   11     'variables': { |  | 
|   12       'target_base': 'none', |  | 
|   13     }, |  | 
|   14     'target_conditions': [ |  | 
|   15       ['target_base=="ncdis_util"', { |  | 
|   16         'sources': [ |  | 
|   17           'ncdis_segments.c', |  | 
|   18           'nc_read_segment.c', |  | 
|   19         ], |  | 
|   20         'defines': [ |  | 
|   21           'NACL_TRUSTED_BUT_NOT_TCB', |  | 
|   22         ], |  | 
|   23         'cflags!': [ |  | 
|   24           '-Wextra', |  | 
|   25           '-Wswitch-enum', |  | 
|   26           '-Wsign-compare' |  | 
|   27         ], |  | 
|   28         'xcode_settings': { |  | 
|   29           'WARNING_CFLAGS!': [ |  | 
|   30             '-Wextra', |  | 
|   31             '-Wswitch-enum', |  | 
|   32             '-Wsign-compare' |  | 
|   33           ], |  | 
|   34         }, |  | 
|   35       }], |  | 
|   36       ['target_base=="ncval"', { |  | 
|   37         'sources': [ |  | 
|   38           'ncval.c', |  | 
|   39         ], |  | 
|   40         'defines': [ |  | 
|   41           'NACL_TRUSTED_BUT_NOT_TCB', |  | 
|   42         ], |  | 
|   43         'cflags!': [ |  | 
|   44           '-Wextra', |  | 
|   45           '-Wswitch-enum', |  | 
|   46           '-Wsign-compare' |  | 
|   47         ], |  | 
|   48         'xcode_settings': { |  | 
|   49           'WARNING_CFLAGS!': [ |  | 
|   50             '-Wextra', |  | 
|   51             '-Wswitch-enum', |  | 
|   52             '-Wsign-compare' |  | 
|   53           ], |  | 
|   54         }, |  | 
|   55       }], |  | 
|   56     ], |  | 
|   57   }, |  | 
|   58   # ---------------------------------------------------------------------- |  | 
|   59   'conditions': [ |  | 
|   60     ['target_arch=="ia32"', { |  | 
|   61       'targets': [ |  | 
|   62         { |  | 
|   63           'target_name': 'ncdis_util_x86_32', |  | 
|   64           'type': 'static_library', |  | 
|   65           'variables': { |  | 
|   66             'target_base': 'ncdis_util', |  | 
|   67           }, |  | 
|   68           'sources': ['ncenuminsts_x86_32.c'], |  | 
|   69         }, { |  | 
|   70           'target_name': 'ncval_x86_32', |  | 
|   71           'type': 'executable', |  | 
|   72           'variables': { |  | 
|   73             'target_base': 'ncval', |  | 
|   74           }, |  | 
|   75           'dependencies': [ |  | 
|   76             '<(DEPTH)/native_client/src/shared/utils/utils.gyp:utils', |  | 
|   77             '<(DEPTH)/native_client/src/trusted/validator/ncfileutils.gyp:ncfile
     utils_x86_32', |  | 
|   78             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncdis_deco
     de_tables.gyp:ncdis_decode_tables_x86_32', |  | 
|   79             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncval_x86_
     decoder.gyp:nc_opcode_modeling_verbose_x86_32', |  | 
|   80             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_verbose_x86_32', |  | 
|   81             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_x86_32', |  | 
|   82             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncdis_seg_sfi_verbose_x86_32', |  | 
|   83             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncval_seg_sfi_x86_32', |  | 
|   84             '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:n
     cval_base_verbose_x86_32', |  | 
|   85             'ncdis_util_x86_32', |  | 
|   86           ], |  | 
|   87         }], |  | 
|   88     }], |  | 
|   89     ['OS=="win" and target_arch=="ia32"', { |  | 
|   90       'targets': [ |  | 
|   91         { |  | 
|   92           'target_name': 'ncdis_util_x86_64', |  | 
|   93           'type': 'static_library', |  | 
|   94           'variables': { |  | 
|   95             'target_base': 'ncdis_util', |  | 
|   96             'win_target': 'x64', |  | 
|   97           }, |  | 
|   98           'sources': ['ncenuminsts_x86_64.c'], |  | 
|   99         }, { |  | 
|  100           'target_name': 'ncval_x86_64', |  | 
|  101           'type': 'executable', |  | 
|  102           'variables': { |  | 
|  103             'target_base': 'ncval', |  | 
|  104             'win_target': 'x64', |  | 
|  105           }, |  | 
|  106           'dependencies': [ |  | 
|  107             '<(DEPTH)/native_client/src/shared/utils/utils.gyp:utils64', |  | 
|  108             '<(DEPTH)/native_client/src/trusted/validator/ncfileutils.gyp:ncfile
     utils_x86_64', |  | 
|  109             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncdis_deco
     de_tables.gyp:ncdis_decode_tables_x86_64', |  | 
|  110             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncval_x86_
     decoder.gyp:nc_opcode_modeling_verbose_x86_64', |  | 
|  111             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_verbose_x86_64', |  | 
|  112             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_x86_64', |  | 
|  113             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncdis_seg_sfi_verbose_x86_64', |  | 
|  114             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncval_seg_sfi_x86_64', |  | 
|  115             '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:n
     cval_base_verbose_x86_64', |  | 
|  116             'ncdis_util_x86_64', |  | 
|  117           ], |  | 
|  118         }], |  | 
|  119     }], |  | 
|  120     ['target_arch=="x64"', { |  | 
|  121       'targets': [ |  | 
|  122         { |  | 
|  123           'target_name': 'ncdis_util_x86_64', |  | 
|  124           'type': 'static_library', |  | 
|  125           'variables': { |  | 
|  126             'target_base': 'ncdis_util', |  | 
|  127           }, |  | 
|  128           'sources': ['ncenuminsts_x86_64.c'], |  | 
|  129         }, { |  | 
|  130           'target_name': 'ncval_x86_64', |  | 
|  131           'type': 'executable', |  | 
|  132           'variables': { |  | 
|  133             'target_base': 'ncval', |  | 
|  134           }, |  | 
|  135           'dependencies': [ |  | 
|  136             '<(DEPTH)/native_client/src/shared/utils/utils.gyp:utils', |  | 
|  137             '<(DEPTH)/native_client/src/trusted/validator/ncfileutils.gyp:ncfile
     utils_x86_64', |  | 
|  138             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncdis_deco
     de_tables.gyp:ncdis_decode_tables_x86_64', |  | 
|  139             '<(DEPTH)/native_client/src/trusted/validator/x86/decoder/ncval_x86_
     decoder.gyp:nc_opcode_modeling_verbose_x86_64', |  | 
|  140             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_verbose_x86_64', |  | 
|  141             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_reg_sfi/ncva
     l_reg_sfi.gyp:ncval_reg_sfi_x86_64', |  | 
|  142             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncdis_seg_sfi_verbose_x86_64', |  | 
|  143             '<(DEPTH)/native_client/src/trusted/validator/x86/ncval_seg_sfi/ncva
     l_seg_sfi.gyp:ncval_seg_sfi_x86_64', |  | 
|  144             '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:n
     cval_base_verbose_x86_64', |  | 
|  145             'ncdis_util_x86_64', |  | 
|  146           ], |  | 
|  147         }], |  | 
|  148     }], |  | 
|  149   ], |  | 
|  150 } |  | 
| OLD | NEW |