Bug 921670 - Trivial fixup to generate_mozbuild.py to cater for SkFontHost_android_old DONTBUILD
authorGeorge Wright <george@mozilla.com>
Fri, 07 Mar 2014 17:11:57 -0500
changeset 190807 0f8652814898530c1f9a6a0f49c4365b17b70179
parent 190806 cd67334b34c574f789234f6a97fcc7c31ac83df4
child 190814 3bb690f96b9250e9470c9614b05d7d1c6353ebaf
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs921670
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 921670 - Trivial fixup to generate_mozbuild.py to cater for SkFontHost_android_old DONTBUILD
gfx/skia/generate_mozbuild.py
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -55,16 +55,19 @@ DEFINES['SK_G32_SHIFT'] = 8
 DEFINES['SK_B32_SHIFT'] = 0
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa'):
     DEFINES['SK_USE_POSIX_THREADS'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
     DEFINES['SK_BUILD_SSSE3'] = 1
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
+    DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
+
 if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or \
    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or \
    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or \
    CONFIG['MOZ_WIDGET_QT'] or \
    CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
@@ -176,16 +179,17 @@ def generate_separated_sources(platform_
       # 'trunk/src/images/SkImageRef.cpp',
       # 'trunk/src/images/SkImageRef_GlobalPool.cpp',
       # 'trunk/src/images/SkImageRefPool.cpp',
       # 'trunk/src/images/SkImageDecoder.cpp',
       # 'trunk/src/images/SkImageDecoder_Factory.cpp',
     },
     'android': {
       # 'trunk/src/ports/SkDebug_android.cpp',
+      'trunk/src/ports/SkFontHost_android_old.cpp',
       'trunk/src/ports/SkFontHost_cairo.cpp',
       # 'trunk/src/ports/SkFontHost_FreeType.cpp',
       # 'trunk/src/ports/SkFontHost_FreeType_common.cpp',
       # 'trunk/src/ports/SkThread_pthread.cpp',
       # 'trunk/src/ports/SkPurgeableMemoryBlock_android.cpp',
       # 'trunk/src/ports/SkTime_Unix.cpp',
       # 'trunk/src/utils/SkThreadUtils_pthread.cpp',
       # 'trunk/src/images/SkImageRef_ashmem.cpp',