platform_tools/android/bin/android_setup.sh - Issue 1215023017: Update Android Apps to use gradle

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_setup.sh

Issue 1215023017: Update Android Apps to use gradle (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: onlyIf Created 5 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:

Index: platform_tools/android/bin/android_setup.sh

diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh

index 94ae87f9a10ab1a0e703a287dac7b760f3aaf0bd..5396294c7fc41a880b925efdfc23c124c0c7273c 100755

--- a/platform_tools/android/bin/android_setup.sh

+++ b/platform_tools/android/bin/android_setup.sh

@@ -70,6 +70,11 @@ if [ -z "$ANDROID_SDK_ROOT" ]; then

+if [ -z "$ANDROID_HOME" ]; then

+ echo "ANDROID_HOME not set so we are setting it to a default value of ANDROID_SDK_ROOT"

+ exportVar ANDROID_HOME $ANDROID_SDK_ROOT

+fi

# check to see that gclient sync ran successfully

THIRD_PARTY_EXTERNAL_DIR=${SCRIPT_DIR}/../third_party/externals

if [ ! -d "$THIRD_PARTY_EXTERNAL_DIR" ]; then