platform_tools/android/bin/android_setup.sh - 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_setup.sh

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

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

index 1a5ccf9908c2170b43a560f22d71d221f9752759..b11fcaccb48f7ea8c9210aca554242656eba9223 100755

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

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

@@ -161,7 +161,9 @@ setup_device() {

DEFINES="${DEFINES} host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')"

DEFINES="${DEFINES} skia_os=android"

DEFINES="${DEFINES} android_base=${SCRIPT_DIR}/.."

- DEFINES="${DEFINES} skia_shared_lib=1"

+ if [[ "$GYP_DEFINES" != *skia_shared_lib=* ]]; then

+ DEFINES="${DEFINES} skia_shared_lib=1"

+ fi

# Setup the build variation depending on the target device

TARGET_DEVICE="$1"