Add mips dsp arch variants to gyp_to_android.py.

platform_tools/android/gyp_gen/makefile_writer.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Functions for creating an Android.mk from already created dictionaries.
 """
@@ skipping 250 matching lines @@
 
     # update the provided LOCAL_MODULE with a _static suffix
     local_module = common['LOCAL_MODULE'][0]
     static_local_module = local_module + '_static'
     common['LOCAL_MODULE'].reset()
     common['LOCAL_MODULE'].add(static_local_module)
 
     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')
 
     f.write(SHARED_HEADER)
     f.write(CLEAR_VARS)
     f.write('LOCAL_MODULE_CLASS := SHARED_LIBRARIES\n')
     f.write('LOCAL_MODULE := %s\n' % local_module)
     f.write('LOCAL_WHOLE_STATIC_LIBRARIES := %s\n' % static_local_module)
     write_group(f, 'LOCAL_EXPORT_C_INCLUDE_DIRS',
                 common['LOCAL_EXPORT_C_INCLUDE_DIRS'], False)
     f.write('include $(BASE_PATH)/skia_static_deps.mk\n')
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
 
     f.write(SKIA_TOOLS)