commit ad3a5c634d6d96874a8b5f13e96d05d62fd0d35d
author msarett <msarett@google.com> Fri May 06 07:21:26 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 06 07:21:26 2016 -0700
tree e89a5f8a8bce3053845d8eb2fe9344796494572a
parent 56a85e69a8d034e0fdee00e8207cda0a9da06fee

Compile SkForceLinking on CMake

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1956573002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Review-Url: https://codereview.chromium.org/1956573002

public.bzl

diff --git a/public.bzl b/public.bzl
index 5546b24..8eb4d85 100644
--- a/public.bzl
+++ b/public.bzl
@@ -551,20 +551,20 @@
     "SK_BUILD_FOR_UNIX",
     "SK_SAMPLES_FOR_X",
     "SK_SFNTLY_SUBSETTER",
-    "SK_CODEC_DECODES_GIF",
-    "SK_CODEC_DECODES_JPEG",
-    "SK_CODEC_DECODES_PNG",
     "SK_CODEC_DECODES_RAW",
-    "SK_CODEC_DECODES_WEBP",
+    "SK_HAS_GIF_LIBRARY",
+    "SK_HAS_JPEG_LIBRARY",
+    "SK_HAS_PNG_LIBRARY",
+    "SK_HAS_WEBP_LIBRARY",
 ]
 
 DEFINES_ANDROID = [
     "SK_BUILD_FOR_ANDROID",
-    "SK_CODEC_DECODES_GIF",
-    "SK_CODEC_DECODES_JPEG",
-    "SK_CODEC_DECODES_PNG",
     "SK_CODEC_DECODES_RAW",
-    "SK_CODEC_DECODES_WEBP",
+    "SK_HAS_GIF_LIBRARY",
+    "SK_HAS_JPEG_LIBRARY",
+    "SK_HAS_PNG_LIBRARY",
+    "SK_HAS_WEBP_LIBRARY",
 ]
 
 DEFINES_IOS = [