From 366b2da3c391ea85ecd12f5b0193af82410d372e Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 9 Apr 2014 19:55:29 +0000 Subject: [PATCH] Add Skia to the GN build. This makes the GN build of Skia compile and adds it to the GN build. Previously, the configuration of the GN Skia tried to match the confusing array of skia targets. This new version dispenses with that and just adds all files (except SSE ones) to one target. I'm not even sure if it's necessary to split out the SSE ones, but it seems nice since that target will get more complicated when we add Arm and MIPS support. I audited the defines again and added some to the main build config that had been added to the GYP build recently. This improves some operator error messages that I found confusing when I had errors in my file. BUG= R=djsollen@google.com, scottmg@chromium.org Review URL: https://codereview.chromium.org/214883005 git-svn-id: http://src.chromium.org/svn/trunk/src/build@262779 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- config/BUILD.gn | 4 ++++ config/arm.gni | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/BUILD.gn b/config/BUILD.gn index 0f4eb016a..1d58f8624 100644 --- a/config/BUILD.gn +++ b/config/BUILD.gn @@ -44,7 +44,11 @@ config("feature_flags") { "ENABLE_APP_LIST=1", "ENABLE_SETTINGS_APP=1", "ENABLE_MANAGED_USERS=1", + "ENABLE_SERVICE_DISCOVERY=1", + "USE_MOJO=1", "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. + # Temporary suppression until Blink code can be removed. + "BLINK_SCALE_FILTERS_AT_RECORD_TIME", ] if (cld_version > 0) { diff --git a/config/arm.gni b/config/arm.gni index cf6619c8d..f9c6cdcbc 100644 --- a/config/arm.gni +++ b/config/arm.gni @@ -21,12 +21,10 @@ if (cpu_arch == "arm") { if (is_android) { arm_use_neon = false - # Our version of arm_neon_optional from common.gypi. This is not used in the - # current build so is commented out for now. - #arm_optionally_use_neon = false + arm_optionally_use_neon = false } else { arm_use_neon = true - #arm_optionally_use_neon = true + arm_optionally_use_neon = true } if (arm_version == 6) {