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

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

Issue 863173003: Fixes for updated third_party/android_tools. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 10 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/android_link.py ('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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 }], 202 }],
203 ['_toolset=="host"', { 203 ['_toolset=="host"', {
204 'cflags': [ '-m32', '-pthread' ], 204 'cflags': [ '-m32', '-pthread' ],
205 'ldflags': [ '-m32', '-pthread' ], 205 'ldflags': [ '-m32', '-pthread' ],
206 }], 206 }],
207 ], 207 ],
208 }, # Dart_Android_arm_Base 208 }, # Dart_Android_arm_Base
209 'Dart_Android_arm64_Base': { 209 'Dart_Android_arm64_Base': {
210 'abstract': 1, 210 'abstract': 1,
211 'variables': { 211 'variables': {
212 'android_sysroot': '<(android_ndk_root)/platforms/android-L/arch-arm64 ', 212 'android_sysroot': '<(android_ndk_root)/platforms/android-21/arch-arm6 4',
213 'android_ndk_include': '<(android_sysroot)/usr/include', 213 'android_ndk_include': '<(android_sysroot)/usr/include',
214 'android_ndk_lib': '<(android_sysroot)/usr/lib', 214 'android_ndk_lib': '<(android_sysroot)/usr/lib',
215 }, 215 },
216 'target_conditions': [ 216 'target_conditions': [
217 ['_toolset=="target"', { 217 ['_toolset=="target"', {
218 'cflags': [ 218 'cflags': [
219 '-fPIE', 219 '-fPIE',
220 '--sysroot=<(android_sysroot)', 220 '--sysroot=<(android_sysroot)',
221 '-I<(android_ndk_include)', 221 '-I<(android_ndk_include)',
222 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport', 222 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport',
(...skipping 30 matching lines...) Expand all
253 ], 253 ],
254 }], 254 }],
255 ['_toolset=="host"', { 255 ['_toolset=="host"', {
256 'ldflags': [ '-pthread' ], 256 'ldflags': [ '-pthread' ],
257 }], 257 }],
258 ], 258 ],
259 }, # Dart_Android_arm64_Base 259 }, # Dart_Android_arm64_Base
260 }, # configurations 260 }, # configurations
261 }, # target_defaults 261 }, # target_defaults
262 } 262 }
OLDNEW
« no previous file with comments | « tools/android_link.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698