From 5355d87b0783c03a64c305bf3666a4baf2b633e7 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 6 Jun 2017 15:42:47 -0400 Subject: more exclusion of SkImageEncoder_none.cpp The current roll is failing due to double linking: multiple definition of 'SkEncodeImage(SkWStream*, SkPixmap const&, SkEncodedImageFormat, int)' src/images/SkImageEncoder.pic.o: previous definition here Change-Id: I64ada3591b4c4c0cb8deada0dc796d9a0376b6a7 Reviewed-on: https://skia-review.googlesource.com/18855 Reviewed-by: Matt Sarett --- public.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public.bzl b/public.bzl index 2323a698b7..a4ff4105d3 100644 --- a/public.bzl +++ b/public.bzl @@ -170,6 +170,7 @@ BASE_SRCS_UNIX = struct( "src/ports/SkFontMgr_fontconfig.cpp", "src/ports/SkFontMgr_fontconfig_factory.cpp", "src/ports/SkGlobalInitialization_none.cpp", + "src/ports/SkImageEncoder_none.cpp", "src/ports/SkImageGenerator_none.cpp", "src/ports/SkTLS_none.cpp", ], @@ -214,6 +215,7 @@ BASE_SRCS_ANDROID = struct( "src/ports/SkFontMgr_custom_empty_factory.cpp", "src/ports/SkFontMgr_empty_factory.cpp", "src/ports/SkGlobalInitialization_none.cpp", + "src/ports/SkImageEncoder_none.cpp", "src/ports/SkImageGenerator_none.cpp", "src/ports/SkTLS_none.cpp", ], @@ -269,6 +271,7 @@ BASE_SRCS_IOS = struct( "src/ports/SkFontMgr_custom_empty_factory.cpp", "src/ports/SkFontMgr_empty_factory.cpp", "src/ports/SkGlobalInitialization_none.cpp", + "src/ports/SkImageEncoder_none.cpp", "src/ports/SkImageGenerator_none.cpp", "src/ports/SkTLS_none.cpp", ], -- cgit v1.2.3