Build & link libpng as static library everywhere*

Build & link libpng as static library everywhere*

Builds on https://codereview.chromium.org/930283002/ (DIFFERENT ISSUE).

This way, we're running the same version of libpng everywhere, yielding
more consistent test results. In addition, this removes the requirement
for developers to install libpng.

*Except when building for the Android framework.

[scroggo, 2015-03-02 19:37:47]

scroggo@google.com changed reviewers:
+ mtklein@google.com

[mtklein, 2015-03-02 19:59:54]

The CQ bit was checked by mtklein@google.com

[mtklein, 2015-03-02 19:59:55]

lgtm

[commit-bot: I haz the power, 2015-03-02 20:00:31]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/964293003/1

[commit-bot: I haz the power, 2015-03-02 20:00:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-02 20:00:33]

Failed to apply patch for gyp/common_variables.gypi:
While running git apply --index -3 -p1;
  error: patch failed: gyp/common_variables.gypi:121
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: gyp/common_variables.gypi: patch does not apply

Patch:       gyp/common_variables.gypi
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index
dd2c084ff54bb179f17e43ad8c71299ecbea536d..d089512cd3f26b74056a3b39827fdbd39ccace59
100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -76,10 +76,16 @@
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
           'skia_use_system_json%': 1,
+          # skia_libpng_static - instead of linking libpng with '-lpng' and
+          #     including the headers from '/usr/include/png.h', compile and
+          #     statically link the version of libpng in
+          #     third_party/externals/libpng.
+          'skia_libpng_static%': '0',
         }, {
           'skia_os%': '<(skia_os)',
           'skia_chrome_utils%': 1,
           'skia_use_system_json%': 0,
+          'skia_libpng_static%': '1',
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
@@ -121,16 +127,6 @@
             'skia_freetype_static%': '0',
           }
         ],
-        [ 'skia_os in ["mac", "ios", "win"]', {
-            # skia_libpng_static - instead of linking libpng with '-lpng' and
-            #     including the headers from '/usr/include/png.h', compile and
-            #     statically link the version of libpng in
-            #     third_party/externals/libpng.
-            'skia_libpng_static%': '1',
-          }, {
-            'skia_libpng_static%': '0',
-          }
-        ],
       ],
 
       # skia_giflib_static - on OS variants that normally would link giflib

[scroggo, 2015-03-02 20:06:58]

On 2015/03/02 20:00:33, I haz the power (commit-bot) wrote:
> Failed to apply patch for gyp/common_variables.gypi:
> While running git apply --index -3 -p1;
>   error: patch failed: gyp/common_variables.gypi:121
>   error: repository lacks the necessary blob to fall back on 3-way merge.
>   error: gyp/common_variables.gypi: patch does not apply
> 
> Patch:       gyp/common_variables.gypi
> Index: gyp/common_variables.gypi
> diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
> index
>
dd2c084ff54bb179f17e43ad8c71299ecbea536d..d089512cd3f26b74056a3b39827fdbd39ccace59
> 100644
> --- a/gyp/common_variables.gypi
> +++ b/gyp/common_variables.gypi
> @@ -76,10 +76,16 @@
>            'skia_os%': 'android',
>            'skia_chrome_utils%': 0,
>            'skia_use_system_json%': 1,
> +          # skia_libpng_static - instead of linking libpng with '-lpng' and
> +          #     including the headers from '/usr/include/png.h', compile and
> +          #     statically link the version of libpng in
> +          #     third_party/externals/libpng.
> +          'skia_libpng_static%': '0',
>          }, {
>            'skia_os%': '<(skia_os)',
>            'skia_chrome_utils%': 1,
>            'skia_use_system_json%': 0,
> +          'skia_libpng_static%': '1',
>          }],
>          [ 'skia_os == "win"', {
>            'os_posix%': 0,
> @@ -121,16 +127,6 @@
>              'skia_freetype_static%': '0',
>            }
>          ],
> -        [ 'skia_os in ["mac", "ios", "win"]', {
> -            # skia_libpng_static - instead of linking libpng with '-lpng' and
> -            #     including the headers from '/usr/include/png.h', compile
and
> -            #     statically link the version of libpng in
> -            #     third_party/externals/libpng.
> -            'skia_libpng_static%': '1',
> -          }, {
> -            'skia_libpng_static%': '0',
> -          }
> -        ],
>        ],
>  
>        # skia_giflib_static - on OS variants that normally would link giflib

Haha, yeah, I'm still waiting to submit the SkCodec CL on Derek's approval.

[scroggo, 2015-03-02 20:25:24]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2015-03-02 20:26:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/964293003/1

[commit-bot: I haz the power, 2015-03-02 20:29:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-02 20:29:42]

Try jobs failed on following builders:
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-GC...)

[scroggo, 2015-03-03 18:42:02]

Pulled into final version of https://codereview.chromium.org/930283002/