commit c30833327f0dda75a8fbe061f3f1966d1f6621a3
author Mike Klein <mtklein@chromium.org> Mon Dec 12 09:03:56 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 12 15:18:22 2016 +0000
tree 2a9d23d550e22ff2620c416f8924437a1cac4867
parent c87f99ef0649a525471971c4edd8b57fc0f7ef3c

proposed gn_to_bp fixes

in response to 5784

Change-Id: I3ad34a30743e7ffbd04767668c288a4f884eb19c
Reviewed-on: https://skia-review.googlesource.com/5732
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index c687ded..c2258c0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,6 +12,7 @@
 
 declare_args() {
   skia_use_angle = false
+  skia_use_cpufeatures = is_android
   skia_use_expat = true
   skia_use_fontconfig = is_linux
   skia_use_freetype = is_android || is_fuchsia || is_linux
@@ -92,7 +93,6 @@
     "include/private",
     "src/c",
     "src/codec",
-    "src/config",
     "src/core",
     "src/effects",
     "src/effects/gradients",
@@ -640,10 +640,10 @@
   }
 
   if (is_android) {
-    deps += [
-      "//third_party/cpu-features",
-      "//third_party/expat",
-    ]
+    if (skia_use_cpufeatures) {
+      deps += [ "//third_party/cpu-features" ]
+    }
+    deps += [ "//third_party/expat" ]
     sources += [ "src/ports/SkDebug_android.cpp" ]
     libs += [
       "EGL",