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 d79fd4aee83c943bb985d5888e4fcac32213d922..4015c38919f9337d56edc4490ebc02e80bef774c 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')) |