platform_tools/android/bin/android_make - Issue 254073003: Revert of Improve Android scripts:

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: platform_tools/android/bin/android_make

Issue 254073003: Revert of Improve Android scripts: (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 8 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: platform_tools/android/bin/android_make

diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make

index 9601db9b17c7fc7fe3616f69e21027dfcfd208de..572f4a133112b018af4725152af99dcda3aa0019 100755

--- a/platform_tools/android/bin/android_make

+++ b/platform_tools/android/bin/android_make

@@ -11,8 +11,7 @@

SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")

source $SCRIPT_DIR/android_setup.sh

-SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd)

-GYP_GENERATORS=ninja-android "${SKIA_SRC_DIR}/gyp_skia"

+GYP_GENERATORS=ninja-android ./gyp_skia

ninja -C $SKIA_OUT/$BUILDTYPE ${APP_ARGS[@]}

# Write the device id into the .android_config file. This tells