commit 9dbec092512ca2759b46e24850ffde40dee3029f
author benjaminwagner <benjaminwagner@google.com> Mon Nov 02 05:53:38 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 02 05:53:39 2015 -0800
tree eec369f66fb761e62d83eafb0343439effe101a5
parent 02cb37309c01506e2552e931efa9c04a569ed266

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

BUILD.public

diff --git a/BUILD.public b/BUILD.public
index 61fb53f..a2569e2 100644
--- a/BUILD.public
+++ b/BUILD.public
@@ -90,7 +90,6 @@
         "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 @@
         "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 @@
         "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 @@
         "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 @@
     linkopts = LINKOPTS,
     visibility = [":skia_clients"],
     deps = DEPS,
+    alwayslink = 1,
 )
 
 cc_test(

tools/BUILD.public.expected

diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 3bfd1da..02f86a7 100644
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -757,7 +757,6 @@
  '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 @@
  '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',