commit 1c471874c52cfb811fce8a5beed447042319f515
author Mike Klein <mtklein@chromium.org> Fri Jan 13 15:27:45 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 13 21:17:05 2017 +0000
tree fa9f38b4aa9e750373bbc945657cf36a856c16b0
parent 276be051066bc453d22d3e0b947bb96a7d99fa08

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

diff --git a/BUILD.gn b/BUILD.gn
index ddc884b..390f136 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -646,10 +646,10 @@
   }
 
   if (is_android) {
-    deps += [
-      "//third_party/cpu-features",
-      "//third_party/expat",
-    ]
+    deps += [ "//third_party/expat" ]
+    if (is_skia_standalone && ndk != "") {
+      deps += [ "//third_party/cpu-features" ]
+    }
     sources += [ "src/ports/SkDebug_android.cpp" ]
     libs += [
       "EGL",