Remove SK_FREETYPE_HAS_MM.

Remove SK_FREETYPE_HAS_MM.

The SK_FREETYPE_HAS_MM define was added to delay the changes to
support GX variation fonts on platforms which did not compile ftmm.c
into their FreeType build. Now that all builds should have this file
the define can be removed.

Committed: https://skia.googlesource.com/skia/+/4f61fee53af956a8beb4c56fa6479cb6b1aa5159

Committed: https://skia.googlesource.com/skia/+/08d171445b4006a5d620c6121048f4c383dba4d9

[bungeman-skia, 2015-06-01 18:43:54]

The CQ bit was checked by bungeman@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-06-01 18:44:36]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143133006/1

[commit-bot: I haz the power, 2015-06-01 18:49:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-01 18:49:52]

Dry run: This issue passed the CQ dry run.

[bungeman-skia, 2015-06-01 18:52:00]

bungeman@google.com changed reviewers:
+ djsollen@google.com

[bungeman-skia, 2015-06-01 18:52:01]

I think this can finally be enabled on Android now.

[djsollen, 2015-06-01 18:54:04]

lgtm

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
File src/ports/SkFontHost_FreeType.cpp (left):

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
src/ports/SkFontHost_FreeType.cpp:45: #if !defined(SK_BUILD_FOR_ANDROID) ||
defined(SK_ANDROID_FREETYPE_HAS_MM)
was there anywhere in our setup that we defined SK_ANDROID_FREETYPE_HAS_MM

[bungeman-skia, 2015-06-01 18:57:54]

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
File src/ports/SkFontHost_FreeType.cpp (left):

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
src/ports/SkFontHost_FreeType.cpp:45: #if !defined(SK_BUILD_FOR_ANDROID) ||
defined(SK_ANDROID_FREETYPE_HAS_MM)
On 2015/06/01 18:54:04, djsollen wrote:
> was there anywhere in our setup that we defined SK_ANDROID_FREETYPE_HAS_MM

No, I just set it up this way so that it was possible to force it on in Android
when testing.

[bungeman-skia, 2015-06-01 19:04:09]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2015-06-01 19:04:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143133006/1

[commit-bot: I haz the power, 2015-06-01 19:05:29]

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

[reed2, 2015-06-02 01:40:22]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1148303005/ by reed@chromium.org.

The reason for reverting is: seems to be breaking DEPS roll

FAILED: /b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
-shared -Wl,--fatal-warnings -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro
-Wl,-z,defs -fuse-ld=gold -Wl,--no-undefined -Wl,--exclude-libs=libgcc.a
-Wl,--exclude-libs=libc++_static.a -Wl,--exclude-libs=libvpx_assembly_arm.a
-Wl,--icf=safe -Wl,--warn-shared-textrel -nostdlib
--sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
 -Wl,--warn-shared-textrel -Wl,-O1 -Wl,--gc-sections -Wl,--as-needed
-Wl,--version-script=/b/build/slave/android_chromium_gn/build/src/build/android/android_no_jni_exports.lst
-L../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
-o ./libskia.so -Wl,-soname=libskia.so @./libskia.so.rsp && {
/b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf
-d ./libskia.so | grep SONAME ; /b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm
-gD -f p ./libskia.so | cut -f1-2 -d' '; } > ./libskia.so.tmp && if ! cmp -s
./libskia.so.tmp ./libskia.so.TOC; then mv ./libskia.so.tmp ./libskia.so.TOC; fi
&& mkdir -p lib.stripped &&
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
--strip-unneeded -o lib.stripped/libskia.so.tmp libskia.so && if ! cmp -s
lib.stripped/libskia.so.tmp lib.stripped/libskia.so; then mv
lib.stripped/libskia.so.tmp lib.stripped/libskia.so; fi
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:283: error: undefined
reference to 'FT_Get_MM_Var'
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:302: error: undefined
reference to 'FT_Set_Var_Design_Coordinates'
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:1766: error: undefined
reference to 'FT_Get_MM_Var'
collect2: error: ld returned 1 exit status
.

[bungeman-skia, 2015-06-02 15:02:51]

On 2015/06/02 01:40:22, reed2 wrote:
> A revert of this CL (patchset #1 id:1) has been created in
> https://codereview.chromium.org/1148303005/ by mailto:reed@chromium.org.
> 
> The reason for reverting is: seems to be breaking DEPS roll
> 
> FAILED: /b/build/goma/gomacc
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
> -shared -Wl,--fatal-warnings -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro
> -Wl,-z,defs -fuse-ld=gold -Wl,--no-undefined -Wl,--exclude-libs=libgcc.a
> -Wl,--exclude-libs=libc++_static.a -Wl,--exclude-libs=libvpx_assembly_arm.a
> -Wl,--icf=safe -Wl,--warn-shared-textrel -nostdlib
>
--sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
>  -Wl,--warn-shared-textrel -Wl,-O1 -Wl,--gc-sections -Wl,--as-needed
>
-Wl,--version-script=/b/build/slave/android_chromium_gn/build/src/build/android/android_no_jni_exports.lst
>
-L../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
> -o ./libskia.so -Wl,-soname=libskia.so @./libskia.so.rsp && {
> /b/build/goma/gomacc
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf
> -d ./libskia.so | grep SONAME ; /b/build/goma/gomacc
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm
> -gD -f p ./libskia.so | cut -f1-2 -d' '; } > ./libskia.so.tmp && if ! cmp -s
> ./libskia.so.tmp ./libskia.so.TOC; then mv ./libskia.so.tmp ./libskia.so.TOC;
fi
> && mkdir -p lib.stripped &&
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
> --strip-unneeded -o lib.stripped/libskia.so.tmp libskia.so && if ! cmp -s
> lib.stripped/libskia.so.tmp lib.stripped/libskia.so; then mv
> lib.stripped/libskia.so.tmp lib.stripped/libskia.so; fi
> ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:283: error: undefined
> reference to 'FT_Get_MM_Var'
> ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:302: error: undefined
> reference to 'FT_Set_Var_Design_Coordinates'
> ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:1766: error:
undefined
> reference to 'FT_Get_MM_Var'
> collect2: error: ld returned 1 exit status
> .

The issue is apparently the gn build does not know about third_party/freetype at
all. It appears that it may have been accidentally linking against the system
version (which we don't want to do).

[bungeman-skia, 2015-06-03 19:47:25]

On 2015/06/02 15:02:51, bungeman1 wrote:
> On 2015/06/02 01:40:22, reed2 wrote:
> > A revert of this CL (patchset #1 id:1) has been created in
> > https://codereview.chromium.org/1148303005/ by mailto:reed@chromium.org.
> > 
> > The reason for reverting is: seems to be breaking DEPS roll
> > 
> > FAILED: /b/build/goma/gomacc
> >
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
> > -shared -Wl,--fatal-warnings -fPIC -Wl,-z,noexecstack -Wl,-z,now
-Wl,-z,relro
> > -Wl,-z,defs -fuse-ld=gold -Wl,--no-undefined -Wl,--exclude-libs=libgcc.a
> > -Wl,--exclude-libs=libc++_static.a -Wl,--exclude-libs=libvpx_assembly_arm.a
> > -Wl,--icf=safe -Wl,--warn-shared-textrel -nostdlib
> >
>
--sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
> >  -Wl,--warn-shared-textrel -Wl,-O1 -Wl,--gc-sections -Wl,--as-needed
> >
>
-Wl,--version-script=/b/build/slave/android_chromium_gn/build/src/build/android/android_no_jni_exports.lst
> >
>
-L../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
> > -o ./libskia.so -Wl,-soname=libskia.so @./libskia.so.rsp && {
> > /b/build/goma/gomacc
> >
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf
> > -d ./libskia.so | grep SONAME ; /b/build/goma/gomacc
> >
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm
> > -gD -f p ./libskia.so | cut -f1-2 -d' '; } > ./libskia.so.tmp && if ! cmp -s
> > ./libskia.so.tmp ./libskia.so.TOC; then mv ./libskia.so.tmp
./libskia.so.TOC;
> fi
> > && mkdir -p lib.stripped &&
> >
>
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
> > --strip-unneeded -o lib.stripped/libskia.so.tmp libskia.so && if ! cmp -s
> > lib.stripped/libskia.so.tmp lib.stripped/libskia.so; then mv
> > lib.stripped/libskia.so.tmp lib.stripped/libskia.so; fi
> > ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:283: error:
undefined
> > reference to 'FT_Get_MM_Var'
> > ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:302: error:
undefined
> > reference to 'FT_Set_Var_Design_Coordinates'
> > ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:1766: error:
> undefined
> > reference to 'FT_Get_MM_Var'
> > collect2: error: ld returned 1 exit status
> > .
> 
> The issue is apparently the gn build does not know about third_party/freetype
at
> all. It appears that it may have been accidentally linking against the system
> version (which we don't want to do).

Turns out the BUILD.gn file was in chromium's build/secondary . This has now
been cleaned up, so trying again.

[bungeman-skia, 2015-06-03 19:47:30]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2015-06-03 19:47:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143133006/1

[commit-bot: I haz the power, 2015-06-03 19:58:44]

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

[bungeman-skia, 2015-06-03 21:46:57]

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
File src/ports/SkFontHost_FreeType.cpp (left):

https://codereview.chromium.org/1143133006/diff/1/src/ports/SkFontHost_FreeTy...
src/ports/SkFontHost_FreeType.cpp:45: #if !defined(SK_BUILD_FOR_ANDROID) ||
defined(SK_ANDROID_FREETYPE_HAS_MM)
On 2015/06/01 18:57:54, bungeman1 wrote:
> On 2015/06/01 18:54:04, djsollen wrote:
> > was there anywhere in our setup that we defined SK_ANDROID_FREETYPE_HAS_MM
> 
> No, I just set it up this way so that it was possible to force it on in
Android
> when testing.

I stand corrected, there actually was, and it needs to be removed. Will do that.