Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: components/nacl_nonsfi.gyp

Issue 656063003: Non-SFI Mode: Build shared_memory_support_nacl library for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | media/media_nacl.gyp » ('j') | media/media_nacl.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
(...skipping 24 matching lines...) Expand all
35 'sources': [ 35 'sources': [
36 'nacl/loader/nacl_helper_linux.cc', 36 'nacl/loader/nacl_helper_linux.cc',
37 'nacl/loader/nacl_helper_linux.h', 37 'nacl/loader/nacl_helper_linux.h',
38 ], 38 ],
39 39
40 'conditions': [ 40 'conditions': [
41 ['target_arch=="ia32" or target_arch=="x64"', { 41 ['target_arch=="ia32" or target_arch=="x64"', {
42 'extra_deps_newlib32_nonsfi': [ 42 'extra_deps_newlib32_nonsfi': [
43 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', 43 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
44 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a', 44 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
45 '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a ',
45 ], 46 ],
46 }], 47 }],
47 ], 48 ],
48 }, 49 },
49 'dependencies': [ 50 'dependencies': [
50 '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi', 51 '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi',
51 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', 52 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
52 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' , 53 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' ,
53 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 54 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
55
56
57 # Temporary depends on some libraries to make sure they can be
58 # built properly. These are depended by PPAPI library.
59 # TODO(hidehiko): Remove them when PPAPI library is introduced.
60 '../media/media_nacl.gyp:shared_memory_support_nacl',
Junichi Uekawa 2014/10/17 10:24:21 why not <(DEPTH) to be consistent ?
hidehiko 2014/10/20 06:28:17 Good point. Standardized with "../" instead of <(D
54 ], 61 ],
55 }, 62 },
56 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests. 63 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.
57 ], 64 ],
58 }], 65 }],
59 ], 66 ],
60 } 67 }
OLDNEW
« no previous file with comments | « no previous file | media/media_nacl.gyp » ('j') | media/media_nacl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698