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

Side by Side Diff: build/android.gypi

Issue 966773005: introduce android_x64 build target (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 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
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 25 matching lines...) Expand all
36 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 36 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
37 'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)', 37 'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)',
38 }, 38 },
39 'conditions': [ 39 'conditions': [
40 ['android_ndk_root==""', { 40 ['android_ndk_root==""', {
41 'variables': { 41 'variables': {
42 'android_sysroot': '<(android_toolchain)/sysroot/', 42 'android_sysroot': '<(android_toolchain)/sysroot/',
43 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/', 43 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
44 }, 44 },
45 'android_include': '<(android_sysroot)/usr/include', 45 'android_include': '<(android_sysroot)/usr/include',
46 'android_lib': '<(android_sysroot)/usr/lib', 46 'android_lib': '<(android_sysroot)/usr/lib',
Jakob Kummerow 2015/03/04 11:19:35 doesn't this need to be conditional too?
Weiliang 2015/03/05 03:22:36 Done Thanks a lot!
47 'android_stlport_include': '<(android_stlport)/stlport', 47 'android_stlport_include': '<(android_stlport)/stlport',
48 'android_stlport_libs': '<(android_stlport)/libs', 48 'android_stlport_libs': '<(android_stlport)/libs',
49 }, { 49 }, {
50 'variables': { 50 'variables': {
51 'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_ta rget_platform)/arch-<(android_target_arch)', 51 'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_ta rget_platform)/arch-<(android_target_arch)',
52 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/', 52 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',
53 }, 53 },
54 'android_include': '<(android_sysroot)/usr/include', 54 'android_include': '<(android_sysroot)/usr/include',
55 'android_lib': '<(android_sysroot)/usr/lib', 55 'conditions': [
56 ['target_arch=="x64"', {
Jakob Kummerow 2015/03/04 11:19:35 doesn't "arm64" need to be included in this list?
Weiliang 2015/03/05 03:22:36 From android-ndk, arm64 does not need to be includ
57 'android_lib': '<(android_sysroot)/usr/lib64',
58 }, {
59 'android_lib': '<(android_sysroot)/usr/lib',
60 }],
61 ],
56 'android_stlport_include': '<(android_stlport)/stlport', 62 'android_stlport_include': '<(android_stlport)/stlport',
57 'android_stlport_libs': '<(android_stlport)/libs', 63 'android_stlport_libs': '<(android_stlport)/libs',
58 }], 64 }],
59 ], 65 ],
60 # Enable to use the system stlport, otherwise statically 66 # Enable to use the system stlport, otherwise statically
61 # link the NDK one? 67 # link the NDK one?
62 'use_system_stlport%': '<(android_webview_build)', 68 'use_system_stlport%': '<(android_webview_build)',
63 'android_stlport_library': 'stlport_static', 69 'android_stlport_library': 'stlport_static',
64 }, # variables 70 }, # variables
65 'target_defaults': { 71 'target_defaults': {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 'ldflags!': [ 276 'ldflags!': [
271 '-Wl,-z,noexecstack', 277 '-Wl,-z,noexecstack',
272 '-Wl,--gc-sections', 278 '-Wl,--gc-sections',
273 '-Wl,-O1', 279 '-Wl,-O1',
274 '-Wl,--as-needed', 280 '-Wl,--as-needed',
275 ], 281 ],
276 }], 282 }],
277 ], # target_conditions 283 ], # target_conditions
278 }, # target_defaults 284 }, # target_defaults
279 } 285 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698