aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2016-12-12 09:03:56 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-12 15:18:22 +0000
commitc30833327f0dda75a8fbe061f3f1966d1f6621a3 (patch)
tree2a9d23d550e22ff2620c416f8924437a1cac4867 /BUILD.gn
parentc87f99ef0649a525471971c4edd8b57fc0f7ef3c (diff)
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>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn10
1 files changed, 5 insertions, 5 deletions
diff --git a/BUILD.gn b/BUILD.gn
index c687ded6de..c2258c0d11 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,6 +12,7 @@ if (!defined(is_skia_standalone)) {
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 @@ config("skia_private") {
"include/private",
"src/c",
"src/codec",
- "src/config",
"src/core",
"src/effects",
"src/effects/gradients",
@@ -640,10 +640,10 @@ component("skia") {
}
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",