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

Side by Side Diff: base/base_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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 | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # base.gypi must be included before common_untrusted.gypi. 10 # base.gypi must be included before common_untrusted.gypi.
(...skipping 21 matching lines...) Expand all
32 'base_switches.cc', 32 'base_switches.cc',
33 'base_switches.h', 33 'base_switches.h',
34 'strings/string16.cc', 34 'strings/string16.cc',
35 'sync_socket_nacl.cc', 35 'sync_socket_nacl.cc',
36 'time/time_posix.cc', 36 'time/time_posix.cc',
37 ], 37 ],
38 'gcc_compile_flags': [ 38 'gcc_compile_flags': [
39 '-fno-strict-aliasing', 39 '-fno-strict-aliasing',
40 ], 40 ],
41 }, 41 },
42 'dependencies': [
43 '../native_client/tools.gyp:prep_toolchain',
44 ],
45 }, 42 },
46 { 43 {
47 'target_name': 'base_i18n_nacl', 44 'target_name': 'base_i18n_nacl',
48 'type': 'none', 45 'type': 'none',
49 'variables': { 46 'variables': {
50 'base_i18n_target': 1, 47 'base_i18n_target': 1,
51 'nacl_untrusted_build': 1, 48 'nacl_untrusted_build': 1,
52 'nlib_target': 'libbase_i18n_nacl.a', 49 'nlib_target': 'libbase_i18n_nacl.a',
53 'build_glibc': 0, 50 'build_glibc': 0,
54 'build_newlib': 0, 51 'build_newlib': 0,
55 'build_irt': 0, 52 'build_irt': 0,
56 'build_pnacl_newlib': 1, 53 'build_pnacl_newlib': 1,
57 'sources': [ 54 'sources': [
58 'base_switches.cc', 55 'base_switches.cc',
59 'base_switches.h', 56 'base_switches.h',
60 'strings/string16.cc', 57 'strings/string16.cc',
61 'sync_socket_nacl.cc', 58 'sync_socket_nacl.cc',
62 'time/time_posix.cc', 59 'time/time_posix.cc',
63 ], 60 ],
64 }, 61 },
65 'dependencies': [ 62 'dependencies': [
66 '../native_client/tools.gyp:prep_toolchain',
67 '../third_party/icu/icu_nacl.gyp:icudata_nacl', 63 '../third_party/icu/icu_nacl.gyp:icudata_nacl',
68 '../third_party/icu/icu_nacl.gyp:icui18n_nacl', 64 '../third_party/icu/icu_nacl.gyp:icui18n_nacl',
69 '../third_party/icu/icu_nacl.gyp:icuuc_nacl', 65 '../third_party/icu/icu_nacl.gyp:icuuc_nacl',
70 ], 66 ],
71 }, 67 },
72 { 68 {
73 'target_name': 'base_nacl_nonsfi', 69 'target_name': 'base_nacl_nonsfi',
74 'type': 'none', 70 'type': 'none',
75 'variables': { 71 'variables': {
76 'base_target': 1, 72 'base_target': 1,
(...skipping 29 matching lines...) Expand all
106 'rand_util_posix.cc', 102 'rand_util_posix.cc',
107 103
108 # For CancelableSyncSocket. 104 # For CancelableSyncSocket.
109 'sync_socket_nacl.cc', 105 'sync_socket_nacl.cc',
110 ], 106 ],
111 }, 107 },
112 'sources!': [ 108 'sources!': [
113 'rand_util_nacl.cc', 109 'rand_util_nacl.cc',
114 ], 110 ],
115 'dependencies': [ 111 'dependencies': [
116 '../native_client/tools.gyp:prep_toolchain',
117 '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi' , 112 '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi' ,
118 ], 113 ],
119 }, 114 },
120 ], 115 ],
121 }], 116 }],
122 ], 117 ],
123 } 118 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698