diff --git a/skia/SConscript b/skia/SConscript
index 776da0545db866..789006f9af6c9f 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -19,7 +19,7 @@ env.Prepend(
 
 env.Append(
   CPPDEFINES = [
-    'SKIA_DISABLE_SUPPORT_FOR_DECODERS',
+    'SK_BUILD_NO_IMAGE_ENCODE',
   ],
 )
 
@@ -303,6 +303,7 @@ input_files = ChromeFileList([
     'sgl/SkTSearch.cpp',
     'sgl/SkTSort.h',
     'sgl/SkTypeface_fake.cpp',
+    'sgl/SkUnPreMultiply.cpp',
     'sgl/SkUtils.cpp',
     'sgl/SkWriter32.cpp',
     'sgl/SkXfermode.cpp',
@@ -415,6 +416,7 @@ if env.Bit('linux'):
 
 if env.Bit('posix'):
   input_files.append('ports/SkThread_pthread.cpp')
+  input_files.append('ports/SkTime_Unix.cpp')
 
 if env.Bit('mac'):
   input_files.append('ext/bitmap_platform_device_mac.cc')
diff --git a/skia/ports/SkImageDecoder_Factory.cpp b/skia/ports/SkImageDecoder_Factory.cpp
index d5d7b3fbc62ac4..585957c8f32607 100644
--- a/skia/ports/SkImageDecoder_Factory.cpp
+++ b/skia/ports/SkImageDecoder_Factory.cpp
@@ -34,12 +34,14 @@ struct CodecFormat {
 };
 
 static const CodecFormat gPairs[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
     { SkImageDecoder_GIF_Factory,   SkImageDecoder::kGIF_Format },
     { SkImageDecoder_PNG_Factory,   SkImageDecoder::kPNG_Format },
     { SkImageDecoder_ICO_Factory,   SkImageDecoder::kICO_Format },
     { SkImageDecoder_WBMP_Factory,  SkImageDecoder::kWBMP_Format },
     { SkImageDecoder_BMP_Factory,   SkImageDecoder::kBMP_Format },
     { SkImageDecoder_JPEG_Factory,  SkImageDecoder::kJPEG_Format }
+#endif
 };
 
 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
@@ -73,11 +75,15 @@ extern SkMovie* SkMovie_GIF_StreamFactory(SkStream*);
 extern SkMovie* SkMovie_GIF_MemoryFactory(const void*, size_t);
 
 static const SkMovieStreamProc gStreamProc[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
     SkMovie_GIF_StreamFactory
+#endif
 };
 
 static const SkMovieMemoryProc gMemoryProc[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
     SkMovie_GIF_MemoryFactory
+#endif
 };
 
 SkMovie* SkMovie::DecodeStream(SkStream* stream) {
diff --git a/skia/skia.vsprops b/skia/skia.vsprops
index bfc11b14844c47..f9a825b1a9f9f1 100644
--- a/skia/skia.vsprops
+++ b/skia/skia.vsprops
@@ -8,7 +8,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="include;include\corecg;corecg;sgl;picture"
-		PreprocessorDefinitions="SKIA_DISABLE_SUPPORT_FOR_DECODERS"
+		PreprocessorDefinitions="SK_BUILD_NO_IMAGE_ENCODE"
 		DisableSpecificWarnings="4244; 4267; 4345; 4390; 4554; 4800"
 	/>
 </VisualStudioPropertySheet>