Skip to content

Commit

Permalink
Remove unused code
Browse files Browse the repository at this point in the history
We don't use yasm, libjpeg_turbo, or mojo's devtools.
  • Loading branch information
abarth committed Dec 11, 2015
1 parent 86e9b92 commit fb374a9
Show file tree
Hide file tree
Showing 32 changed files with 6 additions and 25,713 deletions.
10 changes: 0 additions & 10 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,9 @@ deps = {
Var('chromium_git') + '/external/github.com/domokit/mojo_sdk' + '@' +
Var('mojo_sdk_revision'),

'src/mojo/devtools':
'https://github.com/domokit/devtools.git' + '@' +
Var('mojo_devtools_revision'),

'src/third_party/skia':
Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'),

'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b',

'src/third_party/libjpeg_turbo':
Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'f4631b6ee8b1dbb05e51ae335a7886f9ac598ab6',

'src/third_party/mesa/src':
Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '071d25db04c23821a12a8b260ab9d96a097402f0',
}
Expand Down
4 changes: 2 additions & 2 deletions sky/engine/platform/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,13 @@ source_set("platform") {
"//third_party/libpng",
"//third_party/ots",
"//third_party/qcms",
"//third_party:jpeg",
"//third_party/libjpeg",
"//url",
]

forward_dependent_configs_from = [
"//skia",
"//third_party:jpeg",
"//third_party/libjpeg",
"//third_party/iccjpeg",
"//third_party/libpng",
"//third_party/ots",
Expand Down
4 changes: 1 addition & 3 deletions sky/tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ def to_gn_args(args):
gn_args['target_os'] = 'ios'
gn_args['ios_deployment_target'] = '7.0'
gn_args['use_ios_simulator'] = args.simulator
if args.simulator:
gn_args['use_libjpeg_turbo'] = False
else:
if not args.simulator:
# The iOS simulator snapshot is host targetted
gn_args['dart_target_arch'] = ios_target_cpu
elif args.target_os == 'fnl':
Expand Down
40 changes: 3 additions & 37 deletions third_party/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

if (is_android) {
import("//build/config/android/config.gni")
}

declare_args() {
# Uses system libjpeg. If true, overrides use_libjpeg_turbo.
use_system_libjpeg = false

# Uses libjpeg_turbo as the jpeg implementation. Has no effect if
# use_system_libjpeg is set.
use_libjpeg_turbo = true
}

config("system_libjpeg_config") {
defines = [ "USE_SYSTEM_LIBJPEG" ]
}

config("libjpeg_turbo_config") {
defines = [ "USE_LIBJPEG_TURBO" ]
}

# This is a meta target that forwards to the system's libjpeg,
# third_party/libjpeg, or third_party/libjpeg_turbo depending on the build args
# declared in this file.
group("jpeg") {
if (use_system_libjpeg) {
libs = [ "jpeg" ]
public_configs = [ ":system_libjpeg_config" ]
} else if (use_libjpeg_turbo) {
deps = [
"//third_party/libjpeg_turbo:libjpeg",
]
public_configs = [ ":libjpeg_turbo_config" ]
} else {
deps = [
"//third_party/libjpeg:libjpeg",
]
}
deps = [
"//third_party/libjpeg:libjpeg",
]
}
3 changes: 0 additions & 3 deletions third_party/libjpeg/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# Do not use the targets in this file unless you need a certain libjpeg
# implementation. Use the meta target //third_party:jpeg instead.

config("libjpeg_config") {
include_dirs = [ "." ]
}
Expand Down
Loading

0 comments on commit fb374a9

Please sign in to comment.