| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 }, | 4 }, |
| 5 'includes': [ | 5 'includes': [ |
| 6 '../../build/common_untrusted.gypi', | 6 '../../build/common_untrusted.gypi', |
| 7 ], | 7 ], |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 9 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 10 'targets': [ | 10 'targets': [ |
| 11 { | 11 { |
| 12 'target_name': 'latency_info_nacl', | 12 'target_name': 'latency_info_nacl', |
| 13 'type': 'none', | 13 'type': 'none', |
| 14 'defines': [ | 14 'defines': [ |
| 15 'EVENTS_BASE_IMPLEMENTATION', | 15 'EVENTS_BASE_IMPLEMENTATION', |
| 16 'EVENTS_IMPLEMENTATION', | 16 'EVENTS_IMPLEMENTATION', |
| 17 ], | 17 ], |
| 18 'include_dirs': [ | 18 'include_dirs': [ |
| 19 '../..', | 19 '../..', |
| 20 ], | 20 ], |
| 21 'dependencies': [ | 21 'dependencies': [ |
| 22 '<(DEPTH)/base/base_nacl.gyp:base_nacl', | 22 '../../base/base_nacl.gyp:base_nacl', |
| 23 '<(DEPTH)/ipc/ipc_nacl.gyp:ipc_nacl', | 23 '../../base/base_nacl.gyp:base_nacl_nonsfi', |
| 24 '<(DEPTH)/native_client/tools.gyp:prep_toolchain' | 24 '../../ipc/ipc_nacl.gyp:ipc_nacl', |
| 25 '../../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi', |
| 26 '../../native_client/tools.gyp:prep_toolchain' |
| 25 ], | 27 ], |
| 26 'variables': { | 28 'variables': { |
| 27 'nacl_untrusted_build': 1, | 29 'nacl_untrusted_build': 1, |
| 28 'nlib_target': 'liblatency_info_nacl.a', | 30 'nlib_target': 'liblatency_info_nacl.a', |
| 29 'build_glibc': 0, | 31 'build_glibc': 0, |
| 30 'build_newlib': 0, | 32 'build_newlib': 0, |
| 31 'build_irt': 1, | 33 'build_irt': 1, |
| 34 'build_pnacl_newlib': 0, |
| 35 'build_nonsfi_helper': 1, |
| 32 }, | 36 }, |
| 33 'sources': [ | 37 'sources': [ |
| 34 'latency_info.cc', | 38 'latency_info.cc', |
| 35 'latency_info.h', | 39 'latency_info.h', |
| 36 'ipc/latency_info_param_traits.cc', | 40 'ipc/latency_info_param_traits.cc', |
| 37 'ipc/latency_info_param_traits.h', | 41 'ipc/latency_info_param_traits.h', |
| 38 ], | 42 ], |
| 39 }, | 43 }, |
| 40 ], | 44 ], |
| 41 }], | 45 }], |
| 42 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { | 46 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { |
| 43 'targets': [ | 47 'targets': [ |
| 44 { | 48 { |
| 45 'target_name': 'latency_info_nacl_win64', | 49 'target_name': 'latency_info_nacl_win64', |
| 46 'type' : '<(component)', | 50 'type' : '<(component)', |
| 47 'variables': { | 51 'variables': { |
| 48 'nacl_win64_target': 1, | 52 'nacl_win64_target': 1, |
| 49 }, | 53 }, |
| 50 'dependencies': [ | 54 'dependencies': [ |
| 51 '<(DEPTH)/base/base.gyp:base_win64', | 55 '../../base/base.gyp:base_win64', |
| 52 '<(DEPTH)/ipc/ipc.gyp:ipc_win64', | 56 '../../ipc/ipc.gyp:ipc_win64', |
| 53 ], | 57 ], |
| 54 'defines': [ | 58 'defines': [ |
| 55 'EVENTS_BASE_IMPLEMENTATION', | 59 'EVENTS_BASE_IMPLEMENTATION', |
| 56 'EVENTS_IMPLEMENTATION', | 60 'EVENTS_IMPLEMENTATION', |
| 57 '<@(nacl_win64_defines)', | 61 '<@(nacl_win64_defines)', |
| 58 ], | 62 ], |
| 59 'include_dirs': [ | 63 'include_dirs': [ |
| 60 '../..', | 64 '../..', |
| 61 ], | 65 ], |
| 62 'sources': [ | 66 'sources': [ |
| 63 'latency_info.cc', | 67 'latency_info.cc', |
| 64 'latency_info.h', | 68 'latency_info.h', |
| 65 'ipc/latency_info_param_traits.cc', | 69 'ipc/latency_info_param_traits.cc', |
| 66 'ipc/latency_info_param_traits.h', | 70 'ipc/latency_info_param_traits.h', |
| 67 ], | 71 ], |
| 68 'configurations': { | 72 'configurations': { |
| 69 'Common_Base': { | 73 'Common_Base': { |
| 70 'msvs_target_platform': 'x64', | 74 'msvs_target_platform': 'x64', |
| 71 }, | 75 }, |
| 72 }, | 76 }, |
| 73 }, | 77 }, |
| 74 ], | 78 ], |
| 75 }], | 79 }], |
| 76 ], | 80 ], |
| 77 } | 81 } |
| 78 | 82 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 671443005:
Non-SFI mode: build latency_info_nacl library for nacl_helper_nonsfi. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master