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

Side by Side Diff: build/android.gypi

Issue 398643006: Really fix the arm builder bots by copying android_webview_build out one scope in toolchain.gypi (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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'android_include': '<(android_sysroot)/usr/include', 54 'android_include': '<(android_sysroot)/usr/include',
55 'android_lib': '<(android_sysroot)/usr/lib', 55 'android_lib': '<(android_sysroot)/usr/lib',
56 'android_stlport_include': '<(android_stlport)/stlport', 56 'android_stlport_include': '<(android_stlport)/stlport',
57 'android_stlport_libs': '<(android_stlport)/libs', 57 'android_stlport_libs': '<(android_stlport)/libs',
58 }], 58 }],
59 ], 59 ],
60 # Enable to use the system stlport, otherwise statically 60 # Enable to use the system stlport, otherwise statically
61 # link the NDK one? 61 # link the NDK one?
62 'use_system_stlport%': '<(android_webview_build)', 62 'use_system_stlport%': '<(android_webview_build)',
63 'android_stlport_library': 'stlport_static', 63 'android_stlport_library': 'stlport_static',
64 # Copy it out one scope.
65 'android_webview_build%': '<(android_webview_build)',
66 }, # variables 64 }, # variables
67 'target_defaults': { 65 'target_defaults': {
68 'defines': [ 66 'defines': [
69 'ANDROID', 67 'ANDROID',
70 'V8_ANDROID_LOG_STDOUT', 68 'V8_ANDROID_LOG_STDOUT',
71 ], 69 ],
72 'configurations': { 70 'configurations': {
73 'Release': { 71 'Release': {
74 'cflags': [ 72 'cflags': [
75 '-fomit-frame-pointer', 73 '-fomit-frame-pointer',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 'ldflags!': [ 265 'ldflags!': [
268 '-Wl,-z,noexecstack', 266 '-Wl,-z,noexecstack',
269 '-Wl,--gc-sections', 267 '-Wl,--gc-sections',
270 '-Wl,-O1', 268 '-Wl,-O1',
271 '-Wl,--as-needed', 269 '-Wl,--as-needed',
272 ], 270 ],
273 }], 271 }],
274 ], # target_conditions 272 ], # target_conditions
275 }, # target_defaults 273 }, # target_defaults
276 } 274 }
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