aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2014-06-05 10:28:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-05 10:28:36 -0700
commit9de2fb680f0f09d759fcbedf22f69158fcb84682 (patch)
tree50242ca8c06c917a1322037ba5b6e24af9020ace /platform_tools/android
parent6dd061f138f6f797b98d2fb22b0a2e48e8164fba (diff)
Add mips64 to the makefile.
Currently we have no optimizations for mips64, so it correctly contains the various _none.cpps. Corresponds to https://android-review.googlesource.com/#/c/96536/1 R=halcanary@google.com, djsollen@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/311163003
Diffstat (limited to 'platform_tools/android')
-rwxr-xr-xplatform_tools/android/bin/gyp_to_android.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index d79fd4aee8..4015c38919 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -103,6 +103,9 @@ def main(target_dir=None, require_sk_user_config=False):
mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False)
+ mips64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips64',
+ False)
+
arm64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm64',
False)
@@ -110,7 +113,8 @@ def main(target_dir=None, require_sk_user_config=False):
# 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, arm64_var_dict]
+ x86_var_dict, mips_var_dict, mips64_var_dict,
+ arm64_var_dict]
common = vars_dict_lib.intersect(var_dict_list)
common.LOCAL_MODULE.add('libskia')
@@ -186,6 +190,9 @@ def main(target_dir=None, require_sk_user_config=False):
deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict,
'mips'))
+ deviations_from_common.append(makefile_writer.VarsDictData(mips64_var_dict,
+ 'mips64'))
+
deviations_from_common.append(makefile_writer.VarsDictData(arm64_var_dict,
'arm64'))