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

Side by Side Diff: tools/gyp/configurations_android.gypi

Issue 23889034: Revert last commit (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 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 | « tools/gyp/common.gypi ('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 (c) 2012, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 # Definitions for building standalone Dart binaries to run on Android. 5 # Definitions for building standalone Dart binaries to run on Android.
6 # This is mostly excerpted from: 6 # This is mostly excerpted from:
7 # http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi 7 # http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi
8 8
9 { 9 {
10 'variables': { 10 'variables': {
(...skipping 15 matching lines...) Expand all
26 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 26 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
27 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', 27 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
28 # Enable to use the system stlport, otherwise statically 28 # Enable to use the system stlport, otherwise statically
29 # link the NDK one? 29 # link the NDK one?
30 'use_system_stlport%': '<(android_build_type)', 30 'use_system_stlport%': '<(android_build_type)',
31 'android_stlport_library': 'stlport_static', 31 'android_stlport_library': 'stlport_static',
32 # Copy it out one scope. 32 # Copy it out one scope.
33 'android_build_type%': '<(android_build_type)', 33 'android_build_type%': '<(android_build_type)',
34 34
35 'OS': 'android', 35 'OS': 'android',
36 'android_target_arch%' : 'arm', 36 'android_target_arch' : 'x86',
37 'armv7': 1,
38 }, # variables 37 }, # variables
39 'target_defaults': { 38 'target_defaults': {
40 'defines': [ 39 'defines': [
41 'ANDROID', 40 'ANDROID',
42 ], 41 ],
43 'configurations': { 42 'configurations': {
44 'Dart_Debug': { 43 'Dart_Debug': {
45 'defines': [ 44 'defines': [
46 'DEBUG', 45 'DEBUG',
47 ], 46 ],
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'ldflags!': [ 203 'ldflags!': [
205 '-Wl,-z,noexecstack', 204 '-Wl,-z,noexecstack',
206 '-Wl,--gc-sections', 205 '-Wl,--gc-sections',
207 '-Wl,-O1', 206 '-Wl,-O1',
208 '-Wl,--as-needed', 207 '-Wl,--as-needed',
209 ], 208 ],
210 }], 209 }],
211 ], # target_conditions 210 ], # target_conditions
212 }, # target_defaults 211 }, # target_defaults
213 } 212 }
OLDNEW
« no previous file with comments | « tools/gyp/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698