Skip to content

Commit

Permalink
Add Skia to the GN build.
Browse files Browse the repository at this point in the history
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: svn://svn.chromium.org/chrome/trunk/src@262779 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Apr 9, 2014
1 parent 11672a8 commit 7867196
Show file tree
Hide file tree
Showing 8 changed files with 1,275 additions and 1,321 deletions.
1 change: 1 addition & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ group("root") {
"//third_party/freetype2",
#"//third_party/icu:icudata",
#"//third_party/leveldatabase",
"//skia",
"//third_party/libpng",
"//third_party/libusb",
"//third_party/re2",
Expand Down
1 change: 1 addition & 0 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ component("base") {
"process/launch_mac.cc",
"process/launch_posix.cc",
"process/launch_win.cc",
"process/memory.cc",
"process/memory.h",
"process/memory_linux.cc",
"process/memory_mac.mm",
Expand Down
4 changes: 4 additions & 0 deletions build/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 2 additions & 4 deletions build/config/arm.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 7867196

Please sign in to comment.