diff --git a/DEPS b/DEPS index e821e85de3..0b72d1e61b 100644 --- a/DEPS +++ b/DEPS @@ -20,10 +20,8 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'skia_revision': '2ced78866fcadd98895777c8dffe92e229775181', - 'angle_revision': '02df796f466cee47f42130bd8c7dbad6c72a1662', 'dart_revision': 'e5e3d161e70d862608e6597facdf5ac8ae9ab2c3', 'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485', - 'boringssl_revision': '7f15ff53d82a1991d6732d2303eb652b1cf7e023', 'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b', @@ -58,9 +56,6 @@ deps = { 'src/testing/gmock': Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271', - 'src/third_party/angle': - Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), - 'src/third_party/icu': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c3f79166089e5360c09e3053fce50e6e296c3204', @@ -81,18 +76,9 @@ deps = { 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'f4631b6ee8b1dbb05e51ae335a7886f9ac598ab6', - 'src/third_party/smhasher/src': - Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', - 'src/third_party/mesa/src': Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '071d25db04c23821a12a8b260ab9d96a097402f0', - 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('boringssl_revision'), - - 'src/third_party/requests/src': - Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', - 'src/third_party/dart-pkg/archive': Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + Var('archive_dart_revision'), @@ -150,9 +136,6 @@ deps_os = { 'src/third_party/robolectric/lib': Var('chromium_git') + '/chromium/third_party/robolectric.git' + '@' + '6b63c99a8b6967acdb42cbed0adb067c80efc810', - 'src/third_party/appurify-python/src': - Var('chromium_git') + '/external/github.com/appurify/appurify-python.git' + '@' + 'ee7abd5c5ae3106f72b2a0b9d2cb55094688e867', - 'src/third_party/freetype-android/src': Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'e186230678ee8e4ea4ac4797ece8125761e3225a', }, diff --git a/engine/src/flutter/sky/tools/roll/roll.py b/engine/src/flutter/sky/tools/roll/roll.py index af26105420..e58de49ebb 100755 --- a/engine/src/flutter/sky/tools/roll/roll.py +++ b/engine/src/flutter/sky/tools/roll/roll.py @@ -38,11 +38,6 @@ _build_deps = [ 'tools/valgrind', ] -# things used from //mojo/public -_mojo_sdk_deps = [ - 'third_party/cython', -] - _chromium_libs = [ 'crypto', 'url', @@ -51,7 +46,6 @@ _chromium_libs = [ _third_party_deps = [ 'third_party/android_platform', 'third_party/apple_apsl', - 'third_party/boringssl', 'third_party/brotli', 'third_party/expat', 'third_party/freetype-android', @@ -73,12 +67,10 @@ _third_party_deps = [ 'third_party/qcms', 'third_party/re2', 'third_party/robolectric', - 'third_party/smhasher', - 'third_party/yasm', 'third_party/zlib', ] -dirs_from_chromium = _base_deps + _build_deps + _mojo_sdk_deps + _chromium_libs + _third_party_deps +dirs_from_chromium = _base_deps + _build_deps + _chromium_libs + _third_party_deps dirs_from_mojo = [ 'gpu', @@ -97,11 +89,13 @@ files_not_to_roll = [ 'build/config/ui.gni', 'build/ls.py', 'build/module_args/mojo.gni', + 'crypto/BUILD.gn', + 'gpu/BUILD.gn', + 'tools/android/download_android_tools.py', 'tools/android/VERSION_LINUX_NDK', 'tools/android/VERSION_LINUX_SDK', 'tools/android/VERSION_MACOSX_NDK', 'tools/android/VERSION_MACOSX_SDK', - 'tools/android/download_android_tools.py', ] diff --git a/engine/src/flutter/third_party/smhasher/BUILD.gn b/engine/src/flutter/third_party/smhasher/BUILD.gn deleted file mode 100644 index fd9088c271..0000000000 --- a/engine/src/flutter/third_party/smhasher/BUILD.gn +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("murmurhash3") { - sources = [ - "src/MurmurHash3.cpp", - "src/MurmurHash3.h", - ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] -} - -source_set("pmurhash") { - sources = [ - "src/PMurHash.c", - "src/PMurHash.h", - ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] -} - -source_set("cityhash") { - sources = [ - "src/City.cpp", - "src/City.h", - ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] -} diff --git a/engine/src/flutter/third_party/smhasher/LICENSE b/engine/src/flutter/third_party/smhasher/LICENSE deleted file mode 100644 index 3f18a844ad..0000000000 --- a/engine/src/flutter/third_party/smhasher/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -All MurmurHash source files are placed in the public domain. - -The license below applies to all other code in SMHasher: - -Copyright (c) 2011 Google, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/engine/src/flutter/third_party/smhasher/README.chromium b/engine/src/flutter/third_party/smhasher/README.chromium deleted file mode 100644 index b84ea3249b..0000000000 --- a/engine/src/flutter/third_party/smhasher/README.chromium +++ /dev/null @@ -1,14 +0,0 @@ -Name: SMHasher -URL: http://code.google.com/p/smhasher/ -Version: 0 -Revision: 147 -License: MIT, Public Domain -License File: LICENSE -Security Critical: yes - -Description: -This is a library containing the MurmurHash3 function, and a hashing function -test suite. - -Licenses are MIT (SMHasher) and Public Domain (MurmurHash). - diff --git a/engine/src/flutter/third_party/smhasher/smhasher.gyp b/engine/src/flutter/third_party/smhasher/smhasher.gyp deleted file mode 100644 index cad864e38b..0000000000 --- a/engine/src/flutter/third_party/smhasher/smhasher.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'murmurhash3', - 'type': 'static_library', - 'sources': [ - 'src/MurmurHash3.h', - 'src/MurmurHash3.cpp', - ], - }, - { - 'target_name': 'pmurhash', - 'type': 'static_library', - 'sources': [ - 'src/PMurHash.h', - 'src/PMurHash.c', - ], - }, - { - 'target_name': 'cityhash', - 'type': 'static_library', - 'sources': [ - 'src/City.cpp', - 'src/City.h', - ], - # TODO(jschuh): http://code.google.com/p/smhasher/issues/detail?id=19 - 'msvs_disabled_warnings': [ - 4267, - ], - }, - ], -}