diff --git a/DEPS b/DEPS index 2f4b8942503..74714662e1d 100644 --- a/DEPS +++ b/DEPS @@ -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', } diff --git a/engine/src/flutter/sky/tools/gn b/engine/src/flutter/sky/tools/gn index c1be7c60b5b..e55bf80ad66 100755 --- a/engine/src/flutter/sky/tools/gn +++ b/engine/src/flutter/sky/tools/gn @@ -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': diff --git a/engine/src/flutter/third_party/BUILD.gn b/engine/src/flutter/third_party/BUILD.gn index 261cb1fecec..5bd3f98f006 100644 --- a/engine/src/flutter/third_party/BUILD.gn +++ b/engine/src/flutter/third_party/BUILD.gn @@ -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", + ] }