Add mips dsp arch variants to gyp_to_android.py.
Fixes Android build for variants mips32r2dsp-fp and mips32r2dspr2-fp by
enabling correct Android.mk file generation.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2359793002
Review-Url: https://codereview.chromium.org/2359793002
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index 4b9e7ec..72ec3c0 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -37,7 +37,7 @@
def generate_var_dict(target_dir, target_file, skia_arch_type, have_neon,
- gyp_source_dir):
+ have_mips_dspr2, have_mips_dspr1, gyp_source_dir):
"""Create a VarsDict for a particular arch type.
Each paramater is passed directly to android_framework_gyp.main().
@@ -47,12 +47,15 @@
target_file: Target gyp file.
skia_arch_type: Target architecture.
have_neon: Whether the target should build for neon.
+ have_mips_dspr2: Whether the target should build for mips_dspr2.
+ have_mips_dspr1: Whether the target should build for mips_dspr1.
gyp_source_dir: Directory for gyp source.
Returns:
A VarsDict containing the variable definitions determined by gyp.
"""
result_file = android_framework_gyp.main(target_dir, target_file,
skia_arch_type, have_neon,
+ have_mips_dspr2, have_mips_dspr1,
gyp_source_dir)
var_dict = vars_dict_lib.VarsDict()
gypd_parser.parse_gypd(var_dict, result_file, '.')
@@ -100,31 +103,38 @@
# The default uses a non-existant archtype, to find all the general
# variable definitions.
default_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'other',
- False, gyp_source_dir)
+ False, False, False, gyp_source_dir)
arm_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm', False,
- gyp_source_dir)
+ False, False, gyp_source_dir)
arm_neon_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm',
- True, gyp_source_dir)
+ True, False, False, gyp_source_dir)
x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False,
- gyp_source_dir)
+ False, False, gyp_source_dir)
x86_64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86_64',
- False, gyp_source_dir)
+ False, False, False, gyp_source_dir)
mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False,
- gyp_source_dir)
+ False, False, gyp_source_dir)
+
+ mips_dspr2_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips',
+ False, True, False, gyp_source_dir)
+
+ mips_dspr1_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips',
+ False, False, True, gyp_source_dir)
mips64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips64',
- False, gyp_source_dir)
+ False, False, False, gyp_source_dir)
arm64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm64',
- False, gyp_source_dir)
+ False, False, False, gyp_source_dir)
# Compute the intersection of all targets. All the files in the intersection
# 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, x86_64_var_dict, mips_var_dict,
- mips64_var_dict, arm64_var_dict]
+ mips_dspr1_var_dict, mips_dspr2_var_dict, mips64_var_dict,
+ arm64_var_dict]
common = vars_dict_lib.intersect(var_dict_list)
common.LOCAL_MODULE.add('libskia')
@@ -183,6 +193,12 @@
deviations_from_common.append(makefile_writer.VarsDictData(x86_64_var_dict,
'x86_64'))
+ deviations_from_common.append(makefile_writer.VarsDictData(
+ mips_dspr2_var_dict, 'mips', 'mips32r2dspr2-fp'))
+
+ deviations_from_common.append(makefile_writer.VarsDictData(
+ mips_dspr1_var_dict, 'mips', 'mips32r2dsp-fp'))
+
deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict,
'mips'))
diff --git a/platform_tools/android/gyp_gen/android_framework_gyp.py b/platform_tools/android/gyp_gen/android_framework_gyp.py
index 34a9eee..3d0536b 100644
--- a/platform_tools/android/gyp_gen/android_framework_gyp.py
+++ b/platform_tools/android/gyp_gen/android_framework_gyp.py
@@ -25,7 +25,7 @@
DEBUG_FAILURE = True
def main(target_dir, target_file, skia_arch_type, have_neon,
- gyp_source_dir=None):
+ have_mips_dspr2, have_mips_dspr1, gyp_source_dir=None):
"""Create gypd files based on target_file.
Args:
@@ -70,6 +70,14 @@
else:
gyp_defines += 'arm_neon=0 '
+ if skia_arch_type == 'mips':
+ if have_mips_dspr2:
+ gyp_defines += 'mips_arch_variant=mips32r2 '
+ gyp_defines += 'mips_dsp=2 '
+ elif have_mips_dspr1:
+ gyp_defines += 'mips_arch_variant=mips32r2 '
+ gyp_defines += 'mips_dsp=1 '
+
os.environ['GYP_DEFINES'] = gyp_defines
args = []
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 58fb3a8..6641f7f 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -268,11 +268,23 @@
write_local_vars(f, common, False, None)
for data in deviations_from_common:
- if data.condition:
- f.write('ifeq ($(%s), true)\n' % data.condition)
- write_local_vars(f, data.vars_dict, True, data.name)
- if data.condition:
- f.write('endif\n\n')
+ if data.name == 'mips':
+ if data.condition =='mips32r2dspr2-fp' :
+ f.write('ifeq ($(TARGET_ARCH_VARIANT), %s)\n' % (data.condition))
+ write_local_vars(f, data.vars_dict, True, data.name)
+ elif data.condition =='mips32r2dsp-fp' :
+ f.write('else ifeq ($(TARGET_ARCH_VARIANT), %s)\n' % (data.condition))
+ write_local_vars(f, data.vars_dict, True, data.name)
+ else :
+ f.write('else\n')
+ write_local_vars(f, data.vars_dict, True, data.name)
+ f.write('endif\n\n')
+ else :
+ if data.condition:
+ f.write('ifeq ($(%s), true)\n' % data.condition)
+ write_local_vars(f, data.vars_dict, True, data.name)
+ if data.condition:
+ f.write('endif\n\n')
f.write('LOCAL_MODULE_CLASS := STATIC_LIBRARIES\n')
f.write('include $(BUILD_STATIC_LIBRARY)\n\n')
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py
index 41326fb..a6f2aee 100644
--- a/platform_tools/android/gyp_gen/tool_makefile_writer.py
+++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py
@@ -73,6 +73,8 @@
target_file=target_file,
skia_arch_type='other',
have_neon=False,
+ have_mips_dspr2=False,
+ have_mips_dspr1=False,
gyp_source_dir=gyp_source_dir)
var_dict = vars_dict_lib.VarsDict()