platform_tools/android/bin/android_run_skia - Issue 61893008: Support linking skia statically on Android

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_run_skia

Issue 61893008: Support linking skia statically on Android (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebase Created 7 years, 1 month 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_run_skia

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

index 3314225ba47f81d1ca6e3cfeba38aaba65a82615..11c36756f54adf1e02ec1e656ed72fb96b0d4947 100755

--- a/platform_tools/android/bin/android_run_skia

+++ b/platform_tools/android/bin/android_run_skia

@@ -28,7 +28,10 @@ then

adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp

-adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp

+if [ -f "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" ]; then

+ # Does not exist for builds with static skia.

+ adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp

+fi

adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp

STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"