In BUILD.public, specify alwayslink for skia library.

Some Skia classes use SkTRegistry, which requires the source files be linked in order to be registered.

Also replace "*CG*" with "SkImageDecoder_CG.cpp" for clarity.

BUG=skia:

Review URL: https://codereview.chromium.org/1405023013

diff --git a/BUILD.public b/BUILD.public
index 61fb53fcc2c54dce8c29ae6ba7c2195c0d9c7f58..a2569e26452258b7c0da946f93d7cb6eb4948491 100644 (file)
--- a/BUILD.public
+++ b/BUILD.public
@@ -90,7 +90,6 @@ SRCS_UNIX = glob(
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*android*",
         "src/ports/*chromium*",
-        "src/ports/*CG*",
         "src/ports/*fontconfig*",
         "src/ports/*FontConfig*",
         "src/ports/*mac*",
@@ -99,6 +98,7 @@ SRCS_UNIX = glob(
         "src/ports/*win*",
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
+        "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",
         "src/ports/SkImageDecoder_empty.cpp",
         "src/ports/SkImageGenerator_none.cpp",
@@ -129,7 +129,6 @@ SRCS_ANDROID = glob(
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*chromium*",
-        "src/ports/*CG*",
         "src/ports/*fontconfig*",
         "src/ports/*FontConfig*",
         "src/ports/*mac*",
@@ -140,6 +139,7 @@ SRCS_ANDROID = glob(
         "src/ports/SkFontMgr_custom_directory_factory.cpp",
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
+        "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",
         "src/ports/SkImageDecoder_empty.cpp",
         "src/ports/SkImageGenerator_none.cpp",
@@ -370,6 +370,7 @@ cc_library(
     linkopts = LINKOPTS,
     visibility = [":skia_clients"],
     deps = DEPS,
+    alwayslink = 1,
 )
 
 cc_test(

diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 3bfd1dad135fb2c2f5543ce6a933fe4e935729d6..02f86a7388537271ee6d3c9d4ee0f5d494279ff2 100644 (file)
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -757,7 +757,6 @@ HDRS = ['include/c/sk_canvas.h',
  'include/gpu/GrGpuResourceRef.h',
  'include/gpu/GrInvariantOutput.h',
  'include/gpu/GrPaint.h',
- 'include/gpu/GrPathRendererChain.h',
  'include/gpu/GrProcessor.h',
  'include/gpu/GrProcessorUnitTest.h',
  'include/gpu/GrProgramElement.h',
@@ -1497,6 +1496,7 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/GrPathRenderer.cpp',
  'src/gpu/GrPathRenderer.h',
  'src/gpu/GrPathRendererChain.cpp',
+ 'src/gpu/GrPathRendererChain.h',
  'src/gpu/GrPathRendering.cpp',
  'src/gpu/GrPathRendering.h',
  'src/gpu/GrPathUtils.cpp',