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

Side by Side Diff: build/android.gypi

Issue 148293020: Merge experimental/a64 to bleeding_edge. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove ARM from OWNERS Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Makefile.android ('k') | build/standalone.gypi » ('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 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 ['target_arch=="mipsel"', { 177 ['target_arch=="mipsel"', {
178 'ldflags': [ 178 'ldflags': [
179 '-L<(android_stlport_libs)/mips', 179 '-L<(android_stlport_libs)/mips',
180 ], 180 ],
181 }], 181 }],
182 ['target_arch=="ia32"', { 182 ['target_arch=="ia32"', {
183 'ldflags': [ 183 'ldflags': [
184 '-L<(android_stlport_libs)/x86', 184 '-L<(android_stlport_libs)/x86',
185 ], 185 ],
186 }], 186 }],
187 ['target_arch=="a64"', {
188 'ldflags': [
189 '-L<(android_stlport_libs)/arm64',
190 ],
191 }],
187 ], 192 ],
188 }], 193 }],
189 ['target_arch=="ia32"', { 194 ['target_arch=="ia32"', {
190 # The x86 toolchain currently has problems with stack-protector. 195 # The x86 toolchain currently has problems with stack-protector.
191 'cflags!': [ 196 'cflags!': [
192 '-fstack-protector', 197 '-fstack-protector',
193 ], 198 ],
194 'cflags': [ 199 'cflags': [
195 '-fno-stack-protector', 200 '-fno-stack-protector',
196 ], 201 ],
197 }], 202 }],
198 ['target_arch=="mipsel"', { 203 ['target_arch=="mipsel"', {
199 # The mips toolchain currently has problems with stack-protector. 204 # The mips toolchain currently has problems with stack-protector.
200 'cflags!': [ 205 'cflags!': [
201 '-fstack-protector', 206 '-fstack-protector',
202 '-U__linux__' 207 '-U__linux__'
203 ], 208 ],
204 'cflags': [ 209 'cflags': [
205 '-fno-stack-protector', 210 '-fno-stack-protector',
206 ], 211 ],
207 }], 212 }],
208 ], 213 ],
209 'target_conditions': [ 214 'target_conditions': [
210 ['_type=="executable"', { 215 ['_type=="executable"', {
216 'conditions': [
217 ['target_arch=="a64"', {
218 'ldflags': [
219 '-Wl,-dynamic-linker,/system/bin/linker64',
220 ],
221 }, {
222 'ldflags': [
223 '-Wl,-dynamic-linker,/system/bin/linker',
224 ],
225 }]
226 ],
211 'ldflags': [ 227 'ldflags': [
212 '-Bdynamic', 228 '-Bdynamic',
213 '-Wl,-dynamic-linker,/system/bin/linker',
214 '-Wl,--gc-sections',
215 '-Wl,-z,nocopyreloc', 229 '-Wl,-z,nocopyreloc',
216 # crtbegin_dynamic.o should be the last item in ldflags. 230 # crtbegin_dynamic.o should be the last item in ldflags.
217 '<(android_lib)/crtbegin_dynamic.o', 231 '<(android_lib)/crtbegin_dynamic.o',
218 ], 232 ],
219 'libraries': [ 233 'libraries': [
220 # crtend_android.o needs to be the last item in libraries. 234 # crtend_android.o needs to be the last item in libraries.
221 # Do not add any libraries after this! 235 # Do not add any libraries after this!
222 '<(android_lib)/crtend_android.o', 236 '<(android_lib)/crtend_android.o',
223 ], 237 ],
224 }], 238 }],
(...skipping 18 matching lines...) Expand all
243 'ldflags!': [ 257 'ldflags!': [
244 '-Wl,-z,noexecstack', 258 '-Wl,-z,noexecstack',
245 '-Wl,--gc-sections', 259 '-Wl,--gc-sections',
246 '-Wl,-O1', 260 '-Wl,-O1',
247 '-Wl,--as-needed', 261 '-Wl,--as-needed',
248 ], 262 ],
249 }], 263 }],
250 ], # target_conditions 264 ], # target_conditions
251 }, # target_defaults 265 }, # target_defaults
252 } 266 }
OLDNEW
« no previous file with comments | « Makefile.android ('k') | build/standalone.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698