tools/android_link.py - Issue 863173003: Fixes for updated third_party/android_tools.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/android_link.py

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, 11 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:

Index: tools/android_link.py

===================================================================

--- tools/android_link.py (revision 43137)

+++ tools/android_link.py (working copy)

@@ -108,16 +108,15 @@

# Set up the path to the system root directory, which is where we'll find the

# Android specific system includes and libraries.

android_ndk_sysroot = os.path.join(android_ndk_root,

- 'platforms', 'android-L', 'arch-arm')

+ 'platforms', 'android-14', 'arch-arm')

if target_arch == 'arm64':

android_ndk_sysroot = os.path.join(android_ndk_root,

- 'platforms', 'android-L', 'arch-arm64')

+ 'platforms', 'android-21', 'arch-arm64')

if target_arch == 'ia32':

android_ndk_sysroot = os.path.join(android_ndk_root,

- 'platforms', 'android-L', 'arch-x86')

+ 'platforms', 'android-14', 'arch-x86')

CheckDirExists(android_ndk_sysroot, 'Android sysroot')

android_ndk_lib = os.path.join(android_ndk_sysroot,'usr','lib')

- android_ndk_include = os.path.join(android_ndk_sysroot, 'usr', 'include')

crtend_android = os.path.join(android_ndk_lib, 'crtend_android.o')

if link_target == 'target':

« no previous file with comments | « runtime/vm/signal_handler.h ('k') | tools/gyp/configurations_android.gypi » ('j') | no next file with comments »