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

Side by Side Diff: build/android.gypi

Issue 392033005: Move android_webview_build variable to toolchain.gypi to fix arm builders. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 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 | « no previous file | build/toolchain.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 17 matching lines...) Expand all
28 # Definitions for building standalone V8 binaries to run on Android. 28 # Definitions for building standalone V8 binaries to run on Android.
29 # This is mostly excerpted from: 29 # This is mostly excerpted from:
30 # http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi 30 # http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi
31 31
32 { 32 {
33 'variables': { 33 'variables': {
34 # Location of Android NDK. 34 # Location of Android NDK.
35 'variables': { 35 'variables': {
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 # This is set when building the Android WebView inside the Android build
39 # system, using the 'android' gyp backend.
40 'android_webview_build%': 0,
41 }, 38 },
42 'conditions': [ 39 'conditions': [
43 ['android_ndk_root==""', { 40 ['android_ndk_root==""', {
44 'variables': { 41 'variables': {
45 'android_sysroot': '<(android_toolchain)/sysroot/', 42 'android_sysroot': '<(android_toolchain)/sysroot/',
46 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/', 43 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
47 }, 44 },
48 'android_include': '<(android_sysroot)/usr/include', 45 'android_include': '<(android_sysroot)/usr/include',
49 'android_lib': '<(android_sysroot)/usr/lib', 46 'android_lib': '<(android_sysroot)/usr/lib',
50 'android_stlport_include': '<(android_stlport)/stlport', 47 'android_stlport_include': '<(android_stlport)/stlport',
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 'ldflags!': [ 267 'ldflags!': [
271 '-Wl,-z,noexecstack', 268 '-Wl,-z,noexecstack',
272 '-Wl,--gc-sections', 269 '-Wl,--gc-sections',
273 '-Wl,-O1', 270 '-Wl,-O1',
274 '-Wl,--as-needed', 271 '-Wl,--as-needed',
275 ], 272 ],
276 }], 273 }],
277 ], # target_conditions 274 ], # target_conditions
278 }, # target_defaults 275 }, # target_defaults
279 } 276 }
OLDNEW
« no previous file with comments | « no previous file | build/toolchain.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698