platform_tools/android/bin/android_setup.sh - Issue 916113002: Don't use m32 cflag for x86_64.

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 916113002: Don't use m32 cflag for x86_64. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselijne

Patch Set: Make desktops distinguish between x86 and x86_64 Created 5 years, 10 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 eaa6ac531ac92b329acf6664bb4b7009b2e67cf4..3c6d44d84f73c519d1f362925b0d9217f0b1e89f 100755

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

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

@@ -116,16 +116,16 @@ setup_device() {

ANDROID_ARCH="arm"

;;

intel_rhb | razr_i)

- DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"

+ DEFINES="${DEFINES} skia_arch_type=x86"

DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"

ANDROID_ARCH="x86"

;;

x86)

- DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"

+ DEFINES="${DEFINES} skia_arch_type=x86"

ANDROID_ARCH="x86"

;;

x86_64 | x64)

- DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"

+ DEFINES="${DEFINES} skia_arch_type=x86_64"

ANDROID_ARCH="x86_64"

;;

arm_v7)

« no previous file with comments | « gyp/skia_lib.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »