Bug 1188462 - Add SKIA_INCLUDES list for adding Skia to header search path. r=jrmuizel
authorLee Salzman <lsalzman@mozilla.com>
Thu, 30 Jul 2015 12:05:22 -0400
changeset 255525 2d74c410fed85337d21a000d3887b3b85c223b57
parent 255524 b8802b591ce273baec00243ce338845741dee21d
child 255526 370dc3fc7cc3a87bc2ae99849fbdce63030e864d
push id63059
push userryanvm@gmail.com
push dateThu, 30 Jul 2015 20:31:32 +0000
treeherdermozilla-inbound@370dc3fc7cc3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1188462
milestone42.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 1188462 - Add SKIA_INCLUDES list for adding Skia to header search path. r=jrmuizel
configure.in
dom/canvas/moz.build
gfx/2d/moz.build
gfx/gl/moz.build
gfx/layers/moz.build
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
gfx/thebes/moz.build
image/moz.build
--- a/configure.in
+++ b/configure.in
@@ -8294,29 +8294,32 @@ AC_SUBST_LIST(MOZ_CAIRO_CFLAGS)
 AC_SUBST_LIST(MOZ_CAIRO_LIBS)
 AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
 dnl ========================================================
 dnl Skia
 dnl ========================================================
 if test "$MOZ_ENABLE_SKIA"; then
+  SKIA_INCLUDES="/gfx/skia /gfx/skia/skia/include/config /gfx/skia/skia/include/core"
   AC_DEFINE(MOZ_ENABLE_SKIA)
   AC_DEFINE(USE_SKIA)
   if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
     AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
   fi
 
   if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
+    SKIA_INCLUDES="$SKIA_INCLUDES /gfx/skia/skia/include/gpu /gfx/skia/skia/include/utils"
     MOZ_ENABLE_SKIA_GPU=1
     AC_DEFINE(USE_SKIA_GPU)
     AC_SUBST(MOZ_ENABLE_SKIA_GPU)
   fi
 fi
 AC_SUBST(MOZ_ENABLE_SKIA)
+AC_SUBST_LIST(SKIA_INCLUDES)
 
 dnl ========================================================
 dnl disable xul
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(xul,
 [  --disable-xul           Disable XUL],
     MOZ_XUL= )
 if test "$MOZ_XUL"; then
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -155,8 +155,11 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
+
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -177,14 +177,16 @@ if CONFIG['MOZ_DEBUG']:
 # if CONFIG['NIGHTLY_BUILD']:
 DEFINES['GFX_LOG_WARNING'] = True
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
     # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
     # changes the symbol names of exported C++ functions that use LOGFONT.
     del DEFINES['UNICODE']
     del DEFINES['_UNICODE']
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -155,10 +155,12 @@ if CONFIG['MOZ_D3DCOMPILER_VISTA_DLL']:
 if CONFIG['MOZ_D3DCOMPILER_XP_DLL']:
     DEFINES['MOZ_D3DCOMPILER_XP_DLL'] = CONFIG['MOZ_D3DCOMPILER_XP_DLL']
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
 CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CFLAGS += CONFIG['TK_CFLAGS']
 
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     del DEFINES['UNICODE']
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -406,8 +406,10 @@ CXXFLAGS += [
     ]
 ]
 
 MOCHITEST_MANIFESTS += ['apz/test/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['apz/test/chrome.ini']
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
+
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -152,35 +152,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 """
 
 import json
 
 platforms = ['linux', 'mac', 'android', 'win']
 
-custom_includes = {
-  'skia/src/ports/SkAtomics_sync.h': True,
-  'skia/src/ports/SkAtomics_win.h': True,
-  'skia/src/ports/SkBarriers_x86.h': True,
-  'skia/src/ports/SkBarriers_arm.h': True,
-  'skia/src/ports/SkBarriers_tsan.h': True,
-  'skia/src/ports/SkMutex_pthread.h': True,
-  'skia/src/ports/SkMutex_win.h': True
-}
-
-def generate_includes():
-  includes = {}
-  for root, dirs, files in os.walk('skia/include'):
-    for name in files:
-      if name.endswith('.h'):
-        includes[os.path.join(root, name)] = True
-
-  return dict(includes.items() + custom_includes.items())
-
 def generate_opt_sources():
   opt_sources = {'opts': {''}}
   for root, dirs, files in os.walk('skia/src/opts'):
     for name in files:
       if name.endswith('.cpp'):
         opt_sources['opts'].add(os.path.join(root, name))
 
   return opt_sources
@@ -395,24 +376,22 @@ def write_list(f, name, values, indent):
   f.write(name + ' += [\n')
   for val in val_list:
     write_indent(indent + 4)
     f.write('\'' + val + '\',\n')
 
   write_indent(indent)
   f.write(']\n')
 
-def write_mozbuild(includes, sources):
+def write_mozbuild(sources):
   filename = 'moz.build'
   f = open(filename, 'w')
 
   f.write(header)
 
-  write_list(f, 'EXPORTS.skia', includes, 0)
-
   write_sources(f, sources['common'], 0)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):\n")
   write_sources(f, sources['android'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:\n")
   write_sources(f, sources['mac'], 4)
 
@@ -442,16 +421,15 @@ def write_mozbuild(includes, sources):
 
   f.write(footer)
 
   f.close()
 
   print 'Wrote ' + filename
 
 def main():
-  includes = generate_includes()
   platform_sources = generate_platform_sources()
   separated_sources = generate_separated_sources(platform_sources)
-  write_mozbuild(includes, separated_sources)
+  write_mozbuild(separated_sources)
 
 
 if __name__ == '__main__':
   main()
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -8,314 +8,16 @@
 # ##     #  #     #        #     #  #  #  #  #     #     #      ###
 # # #####   #######        #     #   ## ##   #     #     #      ###
 #
 # Seriously. You shouldn't even be looking at this file unless you're
 # debugging generate_mozbuild.py.
 #
 # DO NOT MODIFY THIS FILE IT IS AUTOGENERATED.
 #
-EXPORTS.skia += [
-    'skia/include/animator/SkAnimator.h',
-    'skia/include/animator/SkAnimatorView.h',
-    'skia/include/config/SkUserConfig.h',
-    'skia/include/core/SkAdvancedTypefaceMetrics.h',
-    'skia/include/core/SkAnnotation.h',
-    'skia/include/core/SkBBHFactory.h',
-    'skia/include/core/SkBitmap.h',
-    'skia/include/core/SkBitmapDevice.h',
-    'skia/include/core/SkBlitRow.h',
-    'skia/include/core/SkBlurTypes.h',
-    'skia/include/core/SkCanvas.h',
-    'skia/include/core/SkChunkAlloc.h',
-    'skia/include/core/SkClipStack.h',
-    'skia/include/core/SkColor.h',
-    'skia/include/core/SkColorFilter.h',
-    'skia/include/core/SkColorPriv.h',
-    'skia/include/core/SkColorShader.h',
-    'skia/include/core/SkColorTable.h',
-    'skia/include/core/SkComposeShader.h',
-    'skia/include/core/SkData.h',
-    'skia/include/core/SkDataTable.h',
-    'skia/include/core/SkDeque.h',
-    'skia/include/core/SkDevice.h',
-    'skia/include/core/SkDeviceProperties.h',
-    'skia/include/core/SkDither.h',
-    'skia/include/core/SkDocument.h',
-    'skia/include/core/SkDraw.h',
-    'skia/include/core/SkDrawFilter.h',
-    'skia/include/core/SkDrawLooper.h',
-    'skia/include/core/SkDrawPictureCallback.h',
-    'skia/include/core/SkDynamicAnnotations.h',
-    'skia/include/core/SkEndian.h',
-    'skia/include/core/SkError.h',
-    'skia/include/core/SkFixed.h',
-    'skia/include/core/SkFlattenable.h',
-    'skia/include/core/SkFlattenableBuffers.h',
-    'skia/include/core/SkFlattenableSerialization.h',
-    'skia/include/core/SkFloatBits.h',
-    'skia/include/core/SkFloatingPoint.h',
-    'skia/include/core/SkFont.h',
-    'skia/include/core/SkFontHost.h',
-    'skia/include/core/SkFontLCDConfig.h',
-    'skia/include/core/SkGraphics.h',
-    'skia/include/core/SkImage.h',
-    'skia/include/core/SkImageDecoder.h',
-    'skia/include/core/SkImageEncoder.h',
-    'skia/include/core/SkImageFilter.h',
-    'skia/include/core/SkImageGenerator.h',
-    'skia/include/core/SkImageInfo.h',
-    'skia/include/core/SkInstCnt.h',
-    'skia/include/core/SkMallocPixelRef.h',
-    'skia/include/core/SkMask.h',
-    'skia/include/core/SkMaskFilter.h',
-    'skia/include/core/SkMath.h',
-    'skia/include/core/SkMatrix.h',
-    'skia/include/core/SkMetaData.h',
-    'skia/include/core/SkOnce.h',
-    'skia/include/core/SkOSFile.h',
-    'skia/include/core/SkPackBits.h',
-    'skia/include/core/SkPaint.h',
-    'skia/include/core/SkPaintOptionsAndroid.h',
-    'skia/include/core/SkPatch.h',
-    'skia/include/core/SkPath.h',
-    'skia/include/core/SkPathEffect.h',
-    'skia/include/core/SkPathMeasure.h',
-    'skia/include/core/SkPathRef.h',
-    'skia/include/core/SkPicture.h',
-    'skia/include/core/SkPictureRecorder.h',
-    'skia/include/core/SkPixelRef.h',
-    'skia/include/core/SkPoint.h',
-    'skia/include/core/SkPostConfig.h',
-    'skia/include/core/SkPreConfig.h',
-    'skia/include/core/SkRasterizer.h',
-    'skia/include/core/SkReadBuffer.h',
-    'skia/include/core/SkReader32.h',
-    'skia/include/core/SkRect.h',
-    'skia/include/core/SkRefCnt.h',
-    'skia/include/core/SkRegion.h',
-    'skia/include/core/SkRRect.h',
-    'skia/include/core/SkScalar.h',
-    'skia/include/core/SkShader.h',
-    'skia/include/core/SkSize.h',
-    'skia/include/core/SkStream.h',
-    'skia/include/core/SkString.h',
-    'skia/include/core/SkStrokeRec.h',
-    'skia/include/core/SkSurface.h',
-    'skia/include/core/SkTArray.h',
-    'skia/include/core/SkTDArray.h',
-    'skia/include/core/SkTDict.h',
-    'skia/include/core/SkTDStack.h',
-    'skia/include/core/SkTemplates.h',
-    'skia/include/core/SkThread.h',
-    'skia/include/core/SkTime.h',
-    'skia/include/core/SkTInternalLList.h',
-    'skia/include/core/SkTLazy.h',
-    'skia/include/core/SkTRegistry.h',
-    'skia/include/core/SkTSearch.h',
-    'skia/include/core/SkTypeface.h',
-    'skia/include/core/SkTypes.h',
-    'skia/include/core/SkUnPreMultiply.h',
-    'skia/include/core/SkUtils.h',
-    'skia/include/core/SkWeakRefCnt.h',
-    'skia/include/core/SkWriteBuffer.h',
-    'skia/include/core/SkWriter32.h',
-    'skia/include/core/SkXfermode.h',
-    'skia/include/device/xps/SkConstexprMath.h',
-    'skia/include/device/xps/SkXPSDevice.h',
-    'skia/include/effects/Sk1DPathEffect.h',
-    'skia/include/effects/Sk2DPathEffect.h',
-    'skia/include/effects/SkAlphaThresholdFilter.h',
-    'skia/include/effects/SkArithmeticMode.h',
-    'skia/include/effects/SkAvoidXfermode.h',
-    'skia/include/effects/SkBitmapSource.h',
-    'skia/include/effects/SkBlurDrawLooper.h',
-    'skia/include/effects/SkBlurImageFilter.h',
-    'skia/include/effects/SkBlurMaskFilter.h',
-    'skia/include/effects/SkColorFilterImageFilter.h',
-    'skia/include/effects/SkColorMatrix.h',
-    'skia/include/effects/SkColorMatrixFilter.h',
-    'skia/include/effects/SkComposeImageFilter.h',
-    'skia/include/effects/SkCornerPathEffect.h',
-    'skia/include/effects/SkDashPathEffect.h',
-    'skia/include/effects/SkDiscretePathEffect.h',
-    'skia/include/effects/SkDisplacementMapEffect.h',
-    'skia/include/effects/SkDrawExtraPathEffect.h',
-    'skia/include/effects/SkDropShadowImageFilter.h',
-    'skia/include/effects/SkEmbossMaskFilter.h',
-    'skia/include/effects/SkGradientShader.h',
-    'skia/include/effects/SkLayerDrawLooper.h',
-    'skia/include/effects/SkLayerRasterizer.h',
-    'skia/include/effects/SkLerpXfermode.h',
-    'skia/include/effects/SkLightingImageFilter.h',
-    'skia/include/effects/SkLumaColorFilter.h',
-    'skia/include/effects/SkMagnifierImageFilter.h',
-    'skia/include/effects/SkMatrixConvolutionImageFilter.h',
-    'skia/include/effects/SkMatrixImageFilter.h',
-    'skia/include/effects/SkMergeImageFilter.h',
-    'skia/include/effects/SkMorphologyImageFilter.h',
-    'skia/include/effects/SkOffsetImageFilter.h',
-    'skia/include/effects/SkPaintFlagsDrawFilter.h',
-    'skia/include/effects/SkPerlinNoiseShader.h',
-    'skia/include/effects/SkPictureImageFilter.h',
-    'skia/include/effects/SkPixelXorXfermode.h',
-    'skia/include/effects/SkPorterDuff.h',
-    'skia/include/effects/SkRectShaderImageFilter.h',
-    'skia/include/effects/SkStippleMaskFilter.h',
-    'skia/include/effects/SkTableColorFilter.h',
-    'skia/include/effects/SkTableMaskFilter.h',
-    'skia/include/effects/SkTestImageFilters.h',
-    'skia/include/effects/SkTileImageFilter.h',
-    'skia/include/effects/SkTransparentShader.h',
-    'skia/include/effects/SkXfermodeImageFilter.h',
-    'skia/include/gpu/gl/GrGLConfig.h',
-    'skia/include/gpu/gl/GrGLConfig_chrome.h',
-    'skia/include/gpu/gl/GrGLExtensions.h',
-    'skia/include/gpu/gl/GrGLFunctions.h',
-    'skia/include/gpu/gl/GrGLInterface.h',
-    'skia/include/gpu/gl/SkANGLEGLContext.h',
-    'skia/include/gpu/gl/SkDebugGLContext.h',
-    'skia/include/gpu/gl/SkGLContextHelper.h',
-    'skia/include/gpu/gl/SkMesaGLContext.h',
-    'skia/include/gpu/gl/SkNativeGLContext.h',
-    'skia/include/gpu/gl/SkNullGLContext.h',
-    'skia/include/gpu/GrBackendEffectFactory.h',
-    'skia/include/gpu/GrClipData.h',
-    'skia/include/gpu/GrColor.h',
-    'skia/include/gpu/GrConfig.h',
-    'skia/include/gpu/GrContext.h',
-    'skia/include/gpu/GrContextFactory.h',
-    'skia/include/gpu/GrCoordTransform.h',
-    'skia/include/gpu/GrDrawEffect.h',
-    'skia/include/gpu/GrEffect.h',
-    'skia/include/gpu/GrEffectStage.h',
-    'skia/include/gpu/GrEffectUnitTest.h',
-    'skia/include/gpu/GrFontScaler.h',
-    'skia/include/gpu/GrGlyph.h',
-    'skia/include/gpu/GrGpuResource.h',
-    'skia/include/gpu/GrPaint.h',
-    'skia/include/gpu/GrPathRendererChain.h',
-    'skia/include/gpu/GrRect.h',
-    'skia/include/gpu/GrRenderTarget.h',
-    'skia/include/gpu/GrSurface.h',
-    'skia/include/gpu/GrTBackendEffectFactory.h',
-    'skia/include/gpu/GrTexture.h',
-    'skia/include/gpu/GrTextureAccess.h',
-    'skia/include/gpu/GrTypes.h',
-    'skia/include/gpu/GrTypesPriv.h',
-    'skia/include/gpu/GrUserConfig.h',
-    'skia/include/gpu/SkGpuDevice.h',
-    'skia/include/gpu/SkGr.h',
-    'skia/include/gpu/SkGrPixelRef.h',
-    'skia/include/gpu/SkGrTexturePixelRef.h',
-    'skia/include/images/SkDecodingImageGenerator.h',
-    'skia/include/images/SkForceLinking.h',
-    'skia/include/images/SkMovie.h',
-    'skia/include/images/SkPageFlipper.h',
-    'skia/include/pathops/SkPathOps.h',
-    'skia/include/pdf/SkPDFDevice.h',
-    'skia/include/pdf/SkPDFDocument.h',
-    'skia/include/pipe/SkGPipe.h',
-    'skia/include/ports/SkFontConfigInterface.h',
-    'skia/include/ports/SkFontMgr.h',
-    'skia/include/ports/SkFontMgr_indirect.h',
-    'skia/include/ports/SkFontStyle.h',
-    'skia/include/ports/SkRemotableFontMgr.h',
-    'skia/include/ports/SkTypeface_android.h',
-    'skia/include/ports/SkTypeface_cairo.h',
-    'skia/include/ports/SkTypeface_mac.h',
-    'skia/include/ports/SkTypeface_win.h',
-    'skia/include/record/SkRecording.h',
-    'skia/include/svg/SkSVGAttribute.h',
-    'skia/include/svg/SkSVGBase.h',
-    'skia/include/svg/SkSVGPaintState.h',
-    'skia/include/svg/SkSVGParser.h',
-    'skia/include/svg/SkSVGTypes.h',
-    'skia/include/utils/ios/SkStream_NSData.h',
-    'skia/include/utils/mac/SkCGUtils.h',
-    'skia/include/utils/SkBoundaryPatch.h',
-    'skia/include/utils/SkCamera.h',
-    'skia/include/utils/SkCanvasStateUtils.h',
-    'skia/include/utils/SkCondVar.h',
-    'skia/include/utils/SkCubicInterval.h',
-    'skia/include/utils/SkCullPoints.h',
-    'skia/include/utils/SkDebugUtils.h',
-    'skia/include/utils/SkDeferredCanvas.h',
-    'skia/include/utils/SkDumpCanvas.h',
-    'skia/include/utils/SkEventTracer.h',
-    'skia/include/utils/SkFrontBufferedStream.h',
-    'skia/include/utils/SkInterpolator.h',
-    'skia/include/utils/SkJSONCPP.h',
-    'skia/include/utils/SkLayer.h',
-    'skia/include/utils/SkLua.h',
-    'skia/include/utils/SkLuaCanvas.h',
-    'skia/include/utils/SkMatrix44.h',
-    'skia/include/utils/SkMeshUtils.h',
-    'skia/include/utils/SkNinePatch.h',
-    'skia/include/utils/SkNoSaveLayerCanvas.h',
-    'skia/include/utils/SkNullCanvas.h',
-    'skia/include/utils/SkNWayCanvas.h',
-    'skia/include/utils/SkParse.h',
-    'skia/include/utils/SkParsePaint.h',
-    'skia/include/utils/SkParsePath.h',
-    'skia/include/utils/SkPathUtils.h',
-    'skia/include/utils/SkPictureUtils.h',
-    'skia/include/utils/SkProxyCanvas.h',
-    'skia/include/utils/SkRandom.h',
-    'skia/include/utils/SkRTConf.h',
-    'skia/include/utils/SkRunnable.h',
-    'skia/include/utils/SkThreadPool.h',
-    'skia/include/utils/SkWGL.h',
-    'skia/include/utils/win/SkAutoCoInitialize.h',
-    'skia/include/utils/win/SkHRESULT.h',
-    'skia/include/utils/win/SkIStream.h',
-    'skia/include/utils/win/SkTScopedComPtr.h',
-    'skia/include/views/android/AndroidKeyToSkKey.h',
-    'skia/include/views/animated/SkBorderView.h',
-    'skia/include/views/animated/SkImageView.h',
-    'skia/include/views/animated/SkProgressBarView.h',
-    'skia/include/views/animated/SkScrollBarView.h',
-    'skia/include/views/animated/SkWidgetViews.h',
-    'skia/include/views/SkApplication.h',
-    'skia/include/views/SkBGViewArtist.h',
-    'skia/include/views/SkEvent.h',
-    'skia/include/views/SkEventSink.h',
-    'skia/include/views/SkKey.h',
-    'skia/include/views/SkOSMenu.h',
-    'skia/include/views/SkOSWindow_Android.h',
-    'skia/include/views/SkOSWindow_iOS.h',
-    'skia/include/views/SkOSWindow_Mac.h',
-    'skia/include/views/SkOSWindow_NaCl.h',
-    'skia/include/views/SkOSWindow_SDL.h',
-    'skia/include/views/SkOSWindow_Unix.h',
-    'skia/include/views/SkOSWindow_Win.h',
-    'skia/include/views/SkStackViewLayout.h',
-    'skia/include/views/SkSystemEventTypes.h',
-    'skia/include/views/SkTextBox.h',
-    'skia/include/views/SkTouchGesture.h',
-    'skia/include/views/SkView.h',
-    'skia/include/views/SkViewInflate.h',
-    'skia/include/views/SkWidget.h',
-    'skia/include/views/SkWindow.h',
-    'skia/include/views/unix/keysym2ucs.h',
-    'skia/include/views/unix/XkeysToSkKeys.h',
-    'skia/include/xml/SkBML_WXMLParser.h',
-    'skia/include/xml/SkBML_XMLParser.h',
-    'skia/include/xml/SkDOM.h',
-    'skia/include/xml/SkJS.h',
-    'skia/include/xml/SkXMLParser.h',
-    'skia/include/xml/SkXMLWriter.h',
-    'skia/src/ports/SkAtomics_sync.h',
-    'skia/src/ports/SkAtomics_win.h',
-    'skia/src/ports/SkBarriers_arm.h',
-    'skia/src/ports/SkBarriers_tsan.h',
-    'skia/src/ports/SkBarriers_x86.h',
-    'skia/src/ports/SkMutex_pthread.h',
-    'skia/src/ports/SkMutex_win.h',
-]
 UNIFIED_SOURCES += [
     'skia/src/core/SkAAClip.cpp',
     'skia/src/core/SkAlphaRuns.cpp',
     'skia/src/core/SkAnnotation.cpp',
     'skia/src/core/SkBBHFactory.cpp',
     'skia/src/core/SkBBoxHierarchyRecord.cpp',
     'skia/src/core/SkBBoxRecord.cpp',
     'skia/src/core/SkBitmap.cpp',
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -296,15 +296,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     # This is set for "normal Android", that is, when Gecko is running on
     # top of the android java runtime.
     DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+
 DEFINES['GRAPHITE2_STATIC'] = True
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['OTS_DLL'] = True
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     del DEFINES['UNICODE']
--- a/image/moz.build
+++ b/image/moz.build
@@ -102,8 +102,11 @@ LOCAL_INCLUDES += [
     # For URI-related functionality
     '/netwerk/base',
     # DecodePool uses thread-related facilities.
     '/xpcom/threads',
 ]
 
 # Because imgFrame.cpp includes "cairo.h"
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+
+LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+