Update android_make to support both --gcc and --clang options.

Update android_make to support both --gcc and --clang options.

This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774503004

Committed: https://skia.googlesource.com/skia/+/f9deeb66d0941adfade8a24fc3b8217f9473bb1d

[djsollen, 2016-03-07 17:40:52]

Description was changed from

==========
Update android_make to support both --gcc and --clang options.

This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
==========

to

==========
Update android_make to support both --gcc and --clang options.

This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[djsollen, 2016-03-07 17:43:04]

The CQ bit was checked by djsollen@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-07 17:43:14]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1774503004/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1774503004/1

[commit-bot: I haz the power, 2016-03-07 17:47:56]

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

[commit-bot: I haz the power, 2016-03-07 17:47:56]

Dry run: Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[djsollen, 2016-03-07 18:04:37]

The CQ bit was checked by djsollen@google.com to run a CQ dry run

[mtklein, 2016-03-07 18:04:45]

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

[commit-bot: I haz the power, 2016-03-07 18:04:46]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1774503004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1774503004/20001

[mtklein, 2016-03-07 18:04:46]

https://codereview.chromium.org/1774503004/diff/1/platform_tools/android/bin/...
File platform_tools/android/bin/android_setup.sh (right):

https://codereview.chromium.org/1774503004/diff/1/platform_tools/android/bin/...
platform_tools/android/bin/android_setup.sh:36: #echo "NOTICE: --clang is
deprecated now that clang is the default compiler"
Line 15 says
   USE_CLANG="false"

[commit-bot: I haz the power, 2016-03-07 18:06:20]

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

[commit-bot: I haz the power, 2016-03-07 18:06:21]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[djsollen, 2016-03-07 18:06:23]

https://codereview.chromium.org/1774503004/diff/1/platform_tools/android/bin/...
File platform_tools/android/bin/android_setup.sh (right):

https://codereview.chromium.org/1774503004/diff/1/platform_tools/android/bin/...
platform_tools/android/bin/android_setup.sh:36: #echo "NOTICE: --clang is
deprecated now that clang is the default compiler"
On 2016/03/07 18:04:46, mtklein wrote:
> Line 15 says
>    USE_CLANG="false"

yeah which is why I commented this line out for now.  I can remove it from the
CL for clarity.

[mtklein, 2016-03-07 18:14:23]

ah, gotcha

lgtm

https://codereview.chromium.org/1774503004/diff/40001/gyp/freetype.gyp
File gyp/freetype.gyp (right):

https://codereview.chromium.org/1774503004/diff/40001/gyp/freetype.gyp#newcod...
gyp/freetype.gyp:105: [ 'skia_clang_build == 1', {
Drop the == 1?

https://codereview.chromium.org/1774503004/diff/40001/gyp/lua.gyp
File gyp/lua.gyp (right):

https://codereview.chromium.org/1774503004/diff/40001/gyp/lua.gyp#newcode70
gyp/lua.gyp:70: [ 'skia_clang_build == 1', {
ditto

[djsollen, 2016-03-07 19:12:26]

The CQ bit was checked by djsollen@google.com

[djsollen, 2016-03-07 19:12:27]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/1774503004/#ps60001
(title: "fix typo")

[commit-bot: I haz the power, 2016-03-07 19:12:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1774503004/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1774503004/60001

[commit-bot: I haz the power, 2016-03-07 19:15:09]

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

[commit-bot: I haz the power, 2016-03-07 19:15:10]

Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[djsollen, 2016-03-07 20:16:00]

The CQ bit was checked by djsollen@google.com

[djsollen, 2016-03-07 20:16:01]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/1774503004/#ps80001
(title: "better way to handle codec.gyp")

[commit-bot: I haz the power, 2016-03-07 20:16:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1774503004/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1774503004/80001

[commit-bot: I haz the power, 2016-03-07 20:30:49]

Description was changed from

==========
Update android_make to support both --gcc and --clang options.

This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Update android_make to support both --gcc and --clang options.

This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/f9deeb66d0941adfade8a24fc3b8217f9473bb1d
==========

[commit-bot: I haz the power, 2016-03-07 20:30:50]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/f9deeb66d0941adfade8a24fc3b8217f9473bb1d