build/android/envsetup.sh - Issue 8523029: Ensure that WebKit can use envsetup.sh

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: build/android/envsetup.sh

Issue 8523029: Ensure that WebKit can use envsetup.sh (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Prefer -n over negated -z Created 9 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: build/android/envsetup.sh

diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh

index 1f0e986c11adfd2eac7a62d040648eeedc428d00..ae149a901f51366fa11369cc375837550ce39d79 100644

--- a/build/android/envsetup.sh

+++ b/build/android/envsetup.sh

@@ -75,7 +75,8 @@ make() {

use_ccache_var=""

- if [ -f "$PWD/build/android/envsetup.sh" ]; then

+ if [ -f "$PWD/build/android/envsetup.sh" ] ||

+ [ -n "${WEBKIT_ANDROID_BUILD}" ]; then

John Grabowski 2011/11/16 19:40:21 This needs doc or an explanation of some kind.

CC="${use_ccache_var}${CROSS_CC}" CXX="${use_ccache_var}${CROSS_CXX}" \

LINK="${CROSS_LINK}" AR="${CROSS_AR}" RANLIB="${CROSS_RANLIB}" \

command make $*

@@ -113,6 +114,7 @@ DEFINES+=" disable_nacl=1"

DEFINES+=" remoting=0"

DEFINES+=" p2p_apis=0"

DEFINES+=" enable_touch_events=1"

+DEFINES+=" build_ffmpegsumo=0"

# TODO(bulach): use "shared_libraries" once the transition from executable

# is over.

DEFINES+=" gtest_target_type=executable"

« no previous file with comments | « no previous file | no next file » | no next file with comments »