platform_tools/android/bin/gyp_to_android.py - 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/gyp_to_android.py

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/gyp_to_android.py

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py

index e700f2fd846639867266dd031ee84c913fc3745d..9ce330c4222edba5d0c916e591f1af99293731fa 100755

--- a/platform_tools/android/bin/gyp_to_android.py

+++ b/platform_tools/android/bin/gyp_to_android.py

@@ -107,6 +107,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):

True, gyp_source_dir)

x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False,

gyp_source_dir)

+ x86_64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86_64',

+ False, gyp_source_dir)

mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False,

gyp_source_dir)

@@ -121,8 +123,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):

# should be part of the makefile always. Each dict will now contain trimmed

# lists containing only variable definitions specific to that configuration.

var_dict_list = [default_var_dict, arm_var_dict, arm_neon_var_dict,

- x86_var_dict, mips_var_dict, mips64_var_dict,

- arm64_var_dict]

+ x86_var_dict, x86_64_var_dict, mips_var_dict,

+ mips64_var_dict, arm64_var_dict]

common = vars_dict_lib.intersect(var_dict_list)

common.LOCAL_MODULE.add('libskia')

@@ -178,8 +180,7 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):

arm_neon_var_dict, 'arm', 'ARCH_ARM_HAVE_NEON'))

deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict,

'x86'))

- # Currently, x86_64 is identical to x86

- deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict,

+ deviations_from_common.append(makefile_writer.VarsDictData(x86_64_var_dict,

'x86_64'))

deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict,