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

Side by Side Diff: build/android.gypi

Issue 233163003: Fix android_arm64 target for experimental ndk (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Makefile.android ('k') | no next file » | 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'variables': { 44 'variables': {
45 'android_sysroot': '<(android_toolchain)/sysroot/', 45 'android_sysroot': '<(android_toolchain)/sysroot/',
46 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/', 46 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
47 }, 47 },
48 'android_include': '<(android_sysroot)/usr/include', 48 'android_include': '<(android_sysroot)/usr/include',
49 'android_lib': '<(android_sysroot)/usr/lib', 49 'android_lib': '<(android_sysroot)/usr/lib',
50 'android_stlport_include': '<(android_stlport)/stlport', 50 'android_stlport_include': '<(android_stlport)/stlport',
51 'android_stlport_libs': '<(android_stlport)/libs', 51 'android_stlport_libs': '<(android_stlport)/libs',
52 }, { 52 }, {
53 'variables': { 53 'variables': {
54 'android_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(and roid_target_arch)', 54 'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_ta rget_platform)/arch-<(android_target_arch)',
55 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/', 55 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',
56 }, 56 },
57 'android_include': '<(android_sysroot)/usr/include', 57 'android_include': '<(android_sysroot)/usr/include',
58 'android_lib': '<(android_sysroot)/usr/lib', 58 'android_lib': '<(android_sysroot)/usr/lib',
59 'android_stlport_include': '<(android_stlport)/stlport', 59 'android_stlport_include': '<(android_stlport)/stlport',
60 'android_stlport_libs': '<(android_stlport)/libs', 60 'android_stlport_libs': '<(android_stlport)/libs',
61 }], 61 }],
62 ], 62 ],
63 # Enable to use the system stlport, otherwise statically 63 # Enable to use the system stlport, otherwise statically
64 # link the NDK one? 64 # link the NDK one?
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 'ldflags!': [ 269 'ldflags!': [
270 '-Wl,-z,noexecstack', 270 '-Wl,-z,noexecstack',
271 '-Wl,--gc-sections', 271 '-Wl,--gc-sections',
272 '-Wl,-O1', 272 '-Wl,-O1',
273 '-Wl,--as-needed', 273 '-Wl,--as-needed',
274 ], 274 ],
275 }], 275 }],
276 ], # target_conditions 276 ], # target_conditions
277 }, # target_defaults 277 }, # target_defaults
278 } 278 }
OLDNEW
« no previous file with comments | « Makefile.android ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698