Add mips dsp arch variants to gyp_to_android.py.

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

Committed: https://skia.googlesource.com/skia/+/5c2310c86d25e4ee02f5891cc3bea0f75d64e91a

[branimir.vasic, 2016-09-21 13:48:40]

Description was changed from

==========
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:
==========

to

==========
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
==========

[branimir.vasic, 2016-09-21 14:02:33]

Description was changed from

==========
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
==========

to

==========
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
==========

[branimir.vasic, 2016-09-21 14:02:33]

branimir.vasic@imgtec.com changed reviewers:
+ djsollen@google.com, nikola.veljkovic@imgtec.com

[Nikola.Veljkovic, 2016-09-21 14:07:55]

nikola.veljkovic@imgtec.com changed reviewers:
+ Nikola.Veljkovic@imgtec.com

[Nikola.Veljkovic, 2016-09-21 14:07:56]

@Derek:
This is a refactored version of the AOSP patch:
https://android-review.googlesource.com/269032

Please take a look.

[djsollen, 2016-09-26 16:06:13]

djsollen@google.com changed reviewers:
+ scroggo@google.com
- Nikola.Veljkovic@imgtec.com

[scroggo, 2016-09-26 16:21:29]

Code LGTM

Does this also need the changes to src/opts/SkBlitRow_opts_mips_dsp.cpp from
https://android-review.googlesource.com/#/c/269032 ?

FYI: The resulting change I see in the Android.mk looks a bit different from
https://android-review.googlesource.com/#/c/269032. Here's what I see:

--- a/Android.mk
+++ b/Android.mk
@@ -846,6 +846,29 @@ LOCAL_SRC_FILES_x86_64 += \
        src/opts/SkOpts_sse42.cpp \
        src/opts/SkOpts_avx.cpp
 
+ifeq ($(TARGET_ARCH_VARIANT), mips32r2dspr2-fp)
+LOCAL_CFLAGS_mips += \
+       -EL \
+       -march=mips32r2 \
+       -mdspr2
+
+LOCAL_SRC_FILES_mips += \
+       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
+       src/opts/SkBlitMask_opts_none.cpp \
+       src/opts/SkBlitRow_opts_mips_dsp.cpp
+
+else ifeq ($(TARGET_ARCH_VARIANT), mips32r2dsp-fp)
+LOCAL_CFLAGS_mips += \
+       -EL \
+       -march=mips32r2 \
+       -mdsp
+
+LOCAL_SRC_FILES_mips += \
+       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
+       src/opts/SkBlitMask_opts_none.cpp \
+       src/opts/SkBlitRow_opts_mips_dsp.cpp
+
+else
 LOCAL_CFLAGS_mips += \
        -EL
 
@@ -854,6 +877,8 @@ LOCAL_SRC_FILES_mips += \
        src/opts/SkBlitMask_opts_none.cpp \
        src/opts/SkBlitRow_opts_none.cpp
 
+endif
+
 LOCAL_CFLAGS_mips64 += \
        -EL

[branimir.vasic, 2016-09-27 09:43:35]

On 2016/09/26 16:21:29, scroggo wrote:
> Code LGTM
> 
> Does this also need the changes to src/opts/SkBlitRow_opts_mips_dsp.cpp from
> https://android-review.googlesource.com/#/c/269032 ?
> 
> FYI: The resulting change I see in the Android.mk looks a bit different from
> https://android-review.googlesource.com/#/c/269032. Here's what I see:
> 
> --- a/Android.mk
> +++ b/Android.mk
> @@ -846,6 +846,29 @@ LOCAL_SRC_FILES_x86_64 += \
>         src/opts/SkOpts_sse42.cpp \
>         src/opts/SkOpts_avx.cpp
>  
> +ifeq ($(TARGET_ARCH_VARIANT), mips32r2dspr2-fp)
> +LOCAL_CFLAGS_mips += \
> +       -EL \
> +       -march=mips32r2 \
> +       -mdspr2
> +
> +LOCAL_SRC_FILES_mips += \
> +       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
> +       src/opts/SkBlitMask_opts_none.cpp \
> +       src/opts/SkBlitRow_opts_mips_dsp.cpp
> +
> +else ifeq ($(TARGET_ARCH_VARIANT), mips32r2dsp-fp)
> +LOCAL_CFLAGS_mips += \
> +       -EL \
> +       -march=mips32r2 \
> +       -mdsp
> +
> +LOCAL_SRC_FILES_mips += \
> +       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
> +       src/opts/SkBlitMask_opts_none.cpp \
> +       src/opts/SkBlitRow_opts_mips_dsp.cpp
> +
> +else
>  LOCAL_CFLAGS_mips += \
>         -EL
>  
> @@ -854,6 +877,8 @@ LOCAL_SRC_FILES_mips += \
>         src/opts/SkBlitMask_opts_none.cpp \
>         src/opts/SkBlitRow_opts_none.cpp
>  
> +endif
> +
>  LOCAL_CFLAGS_mips64 += \
>         -EL

Changes from https://android-review.googlesource.com/#/c/269032 aren't needed.
Android.mk file, which is generated with this patch, is enough. 

Compilers flags -mdspr2 and -mdsp are enough for correct build and execution.
Flags SK_MIPS_HAS_DSP, SK_MIPS_HAS_DSPR2 are unnecessary.

[scroggo, 2016-09-27 13:08:19]

On 2016/09/27 09:43:35, branimir.vasic wrote:
> On 2016/09/26 16:21:29, scroggo wrote:
> > Code LGTM
> > 
> > Does this also need the changes to src/opts/SkBlitRow_opts_mips_dsp.cpp from
> > https://android-review.googlesource.com/#/c/269032 ?
> > 
> > FYI: The resulting change I see in the Android.mk looks a bit different from
> > https://android-review.googlesource.com/#/c/269032. Here's what I see:
> > 
> > --- a/Android.mk
> > +++ b/Android.mk
> > @@ -846,6 +846,29 @@ LOCAL_SRC_FILES_x86_64 += \
> >         src/opts/SkOpts_sse42.cpp \
> >         src/opts/SkOpts_avx.cpp
> >  
> > +ifeq ($(TARGET_ARCH_VARIANT), mips32r2dspr2-fp)
> > +LOCAL_CFLAGS_mips += \
> > +       -EL \
> > +       -march=mips32r2 \
> > +       -mdspr2
> > +
> > +LOCAL_SRC_FILES_mips += \
> > +       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
> > +       src/opts/SkBlitMask_opts_none.cpp \
> > +       src/opts/SkBlitRow_opts_mips_dsp.cpp
> > +
> > +else ifeq ($(TARGET_ARCH_VARIANT), mips32r2dsp-fp)
> > +LOCAL_CFLAGS_mips += \
> > +       -EL \
> > +       -march=mips32r2 \
> > +       -mdsp
> > +
> > +LOCAL_SRC_FILES_mips += \
> > +       src/opts/SkBitmapProcState_opts_mips_dsp.cpp \
> > +       src/opts/SkBlitMask_opts_none.cpp \
> > +       src/opts/SkBlitRow_opts_mips_dsp.cpp
> > +
> > +else
> >  LOCAL_CFLAGS_mips += \
> >         -EL
> >  
> > @@ -854,6 +877,8 @@ LOCAL_SRC_FILES_mips += \
> >         src/opts/SkBlitMask_opts_none.cpp \
> >         src/opts/SkBlitRow_opts_none.cpp
> >  
> > +endif
> > +
> >  LOCAL_CFLAGS_mips64 += \
> >         -EL
> 
> Changes from https://android-review.googlesource.com/#/c/269032 aren't needed.
> Android.mk file, which is generated with this patch, is enough. 
> 
> Compilers flags -mdspr2 and -mdsp are enough for correct build and execution.
> Flags SK_MIPS_HAS_DSP, SK_MIPS_HAS_DSPR2 are unnecessary.

Sgtm. If you're ready to land, click the checkbox next to "Commit"

[branimir.vasic, 2016-09-27 14:03:59]

The CQ bit was checked by branimir.vasic@imgtec.com

[commit-bot: I haz the power, 2016-09-27 14:04:05]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-27 14:37:22]

Description was changed from

==========
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
==========

to

==========
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

Committed:
https://skia.googlesource.com/skia/+/5c2310c86d25e4ee02f5891cc3bea0f75d64e91a
==========

[commit-bot: I haz the power, 2016-09-27 14:37:23]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/5c2310c86d25e4ee02f5891cc3bea0f75d64e91a