OLD | NEW |
---|---|
(Empty) | |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | |
Mark Mentovai
2013/12/19 18:26:47
icu doesn’t really know anything special about NaC
Sergey Ulanov
2013/12/20 00:55:21
untrusted is the suffix used for all other NaCl ta
| |
2 # Use of this source code is governed by a BSD-style license that can be | |
3 # found in the LICENSE file. | |
4 | |
5 { | |
6 'variables': { | |
7 'werror': '', | |
Mark Mentovai
2013/12/19 18:26:47
Why?
Sergey Ulanov
2013/12/20 00:55:21
Removed.
| |
8 }, | |
9 'includes': [ | |
10 'icu.gypi', | |
11 '../../native_client/build/untrusted.gypi', | |
12 ], | |
13 'target_defaults': { | |
14 'direct_dependent_settings': { | |
15 'defines': [ | |
16 # Tell ICU to not insert |using namespace icu;| into its headers, | |
17 # so that chrome's source explicitly has to use |icu::|. | |
18 'U_USING_ICU_NAMESPACE=0', | |
19 ], | |
20 }, | |
21 'defines': [ | |
22 'U_USING_ICU_NAMESPACE=0', | |
23 'U_STATIC_IMPLEMENTATION', | |
24 ], | |
25 'include_dirs': [ | |
26 'source/common', | |
27 'source/i18n', | |
28 ], | |
29 'compile_flags': [ | |
30 '-w', | |
Mark Mentovai
2013/12/19 18:26:47
Why?
Sergey Ulanov
2013/12/20 00:55:21
Replaced with suppressions for specific warnings t
| |
31 ], | |
32 }, | |
33 'targets': [ | |
34 { | |
35 'target_name': 'icudata_untrusted', | |
36 'type': 'none', | |
37 'variables': { | |
38 'nlib_target': 'libicudata_untrusted.a', | |
39 'build_glibc': 1, | |
40 'build_newlib': 1, | |
41 'build_pnacl_newlib': 1, | |
42 'data_c_file': | |
43 '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/nacl/iucdt46l.c', | |
Mark Mentovai
2013/12/19 18:26:47
This file is only dealt with from one target. It c
Sergey Ulanov
2013/12/20 00:55:21
Remove this line.
| |
44 'extra_deps': [ '<(data_c_file)' ], | |
45 'extra_args': [ '<(data_c_file)' ], | |
46 }, | |
47 'dependencies': [ | |
48 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
Mark Mentovai
2013/12/19 18:26:47
You know where native_client is relative to icu in
Sergey Ulanov
2013/12/20 00:55:21
Done.
| |
49 ], | |
50 'defines': [ | |
51 'U_HIDE_DATA_SYMBOL', | |
52 ], | |
53 'actions': [ | |
54 { | |
55 'action_name': 'Convert icudata to C', | |
56 'inputs': [ | |
57 'icu_data_to_c.py', | |
58 'source/data/in/icudt46l.dat' | |
jungshik at Google
2013/12/19 06:25:05
This was renamed to icudtl.dat to make it version-
Sergey Ulanov
2013/12/20 00:55:21
Done.
| |
59 ], | |
60 'outputs': [ | |
61 '<(data_c_file)' | |
62 ], | |
63 'action': [ | |
64 'python', 'icu_data_to_c.py', | |
Mark Mentovai
2013/12/19 18:26:47
Don’t write the same names more than once when you
Sergey Ulanov
2013/12/20 00:55:21
Done.
| |
65 'source/data/in/icudt46l.dat', '<(data_c_file)', | |
jungshik at Google
2013/12/19 06:25:05
ditto
Sergey Ulanov
2013/12/20 00:55:21
Done.
| |
66 ], | |
67 }, | |
68 ], # actions | |
69 }, | |
70 { | |
71 'target_name': 'icui18n_untrusted', | |
72 'type': 'none', | |
73 'variables': { | |
74 'nlib_target': 'libicui18n_untrusted.a', | |
75 'build_glibc': 1, | |
76 'build_newlib': 1, | |
77 'build_pnacl_newlib': 1, | |
78 }, | |
79 'sources': [ | |
80 '<@(icui18n_sources)', | |
81 ], | |
82 'defines': [ | |
83 'U_I18N_IMPLEMENTATION', | |
84 ], | |
85 'dependencies': [ | |
86 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
Mark Mentovai
2013/12/19 18:26:47
As on line 47. And the same on line 111.
Sergey Ulanov
2013/12/20 00:55:21
Done.
| |
87 'icuuc_untrusted', | |
88 ], | |
89 'direct_dependent_settings': { | |
90 'include_dirs': [ | |
91 'source/i18n', | |
92 ], | |
93 }, | |
94 }, | |
95 { | |
96 'target_name': 'icuuc_untrusted', | |
97 'type': 'none', | |
98 'variables': { | |
99 'nlib_target': 'libicuuc_untrusted.a', | |
100 'build_glibc': 1, | |
101 'build_newlib': 1, | |
102 'build_pnacl_newlib': 1, | |
103 }, | |
104 'sources': [ | |
105 '<@(icuuc_sources)', | |
106 ], | |
107 'defines': [ | |
108 'U_COMMON_IMPLEMENTATION', | |
109 ], | |
110 'dependencies': [ | |
111 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
112 'icudata_untrusted', | |
113 ], | |
114 'direct_dependent_settings': { | |
115 'include_dirs': [ | |
116 'source/common', | |
117 ], | |
118 'defines': [ | |
119 'U_STATIC_IMPLEMENTATION', | |
120 ], | |
121 }, | |
122 }, | |
123 ], | |
124 } | |
OLD | NEW |