commit 5355d87b0783c03a64c305bf3666a4baf2b633e7
author Mike Klein <mtklein@chromium.org> Tue Jun 06 15:42:47 2017 -0400
committer Mike Klein <mtklein@google.com> Tue Jun 06 19:47:03 2017 +0000
tree ae778e57cdb1792e604df0a09d5bef095257de3b
parent 4e8c581f2aa911bf49f97a246cc26134da292a8c

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 <msarett@google.com>

public.bzl

diff --git a/public.bzl b/public.bzl
index 2323a69..a4ff410 100644
--- a/public.bzl
+++ b/public.bzl
@@ -170,6 +170,7 @@
         "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 @@
         "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 @@
         "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",
     ],