build/android/envsetup_functions.sh - Issue 147863002: android envsetup: Stop setting use_libffmpeg=0 for x86 targets.

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

Issue 147863002: android envsetup: Stop setting use_libffmpeg=0 for x86 targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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: build/android/envsetup_functions.sh

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

index 67084311542be74788f35f1e8bb5fc7add4c2b2c..ad591d8732923b058723f1c8042917b6b72b2469 100755

--- a/build/android/envsetup_functions.sh

+++ b/build/android/envsetup_functions.sh

@@ -114,9 +114,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}

DEFINES+=" target_arch=arm"

;;

"x86")

- # TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.

- DEFINES+=" use_libffmpeg=0"

host_arch=$(uname -m | sed -e \

's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/')

DEFINES+=" host_arch=${host_arch}"

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