Add mips dsp arch variants to gyp_to_android.py.

platform_tools/android/gyp_gen/makefile_writer.py

Index: platform_tools/android/gyp_gen/makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 58fb3a80e8c923b6b6872cddc70637f8833f56d6..6641f7f973bdba3720b06c53c4fe27025e0916b6 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -268,11 +268,23 @@ def write_android_mk(target_dir, common, deviations_from_common):
     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')