diff options
| author |  scroggo <scroggo@google.com> | 2015-02-12 10:48:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 10:48:25 -0800 |
| commit | df1c3373fc198f465cb0077516993dd41f268416 (patch) | |
| tree | 5df85329712ed32721983b72a8db3f1e474899c6 /platform_tools/android/bin/gyp_to_android.py | |
| parent | 9d7ceca35064b71e13e498da7e641e69b97bf4cf (diff) | |
Don't use m32 cflag for x86_64.
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.
Except when we specifically want x86.
Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.
In gyp_to_android.py, create a separate var_dict for x86_64.
BUG=skia:3419
Review URL: https://codereview.chromium.org/916113002
Diffstat (limited to 'platform_tools/android/bin/gyp_to_android.py')
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index e700f2fd84..9ce330c422 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, |