Fix Android roll
authorMike Klein <mtklein@chromium.org>
Fri, 13 Jan 2017 20:27:45 +0000 (15:27 -0500)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Fri, 13 Jan 2017 21:17:05 +0000 (21:17 +0000)
commit1c471874c52cfb811fce8a5beed447042319f515
treefa9f38b4aa9e750373bbc945657cf36a856c16b0
parent276be051066bc453d22d3e0b947bb96a7d99fa08
Fix Android roll

    - only depend on cpu-features when we know we have an NDK
    - disable SkSplicer

Change-Id: I89e4cc70d6ddf0ebb7005d1cb453768d946cd205
Reviewed-on: https://skia-review.googlesource.com/7060
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
BUILD.gn
gn/gn_to_bp.py