From 5a69707396eda0c517fab76f116750b7c7f3554d Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 3 Mar 2017 11:59:27 -0500 Subject: [PATCH] Tidy up DEPS - Sort alphabetically and align on ':'. - Remove yasm deps. They're unused since we switched to GN. - Remove fetch-gn hook. git-sync-deps does this now. - Remove comments about why DEPS are needed. They're all pretty obvious if you grep for the dependency name. Change-Id: Iefd1a14560f227e957a206e51db8c8ba5520f57b Reviewed-on: https://skia-review.googlesource.com/9197 Reviewed-by: Matt Sarett Commit-Queue: Mike Klein --- DEPS | 68 ++++++++++++++++++-------------------------------------------------- 1 file changed, 18 insertions(+), 50 deletions(-) diff --git a/DEPS b/DEPS index 2fe61a8..5974786 100644 --- a/DEPS +++ b/DEPS @@ -1,56 +1,24 @@ use_relative_paths = True -# Dependencies on outside packages. -# deps = { - "buildtools": "https://chromium.googlesource.com/chromium/buildtools.git@55ad626b08ef971fd82a62b7abb325359542952b", - - "common": "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92", - - # There is some duplication here that might be worth cleaning up: - # - can use use our existing t_p/e/libjpeg instead of pulling it for Android? - - "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@57f17473791703ac82add77c3d77d13d8e2dfbc4", - "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@08fd250e1af0aa16d18012d39462e6ca9bbc6e90", - "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.4.2", - "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", - "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.6.0", - "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633", - - "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", - "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a", - - "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@6de58e0d28014caf2fc1370145f22fd6d65f63e3", - # libjpeg-turbo depends on yasm to compile .asm files - "third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b", - "third_party/externals/yasm/binaries" : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881", - - "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55", - - - # The line below is needed for compiling SkV8Example. Do not delete. - #"third_party/externals/v8": "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", - - # sfntly is used by the PDF backend for font subsetting - "third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916", - # ICU is needed for sfntly. - "third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@ec9c1133693148470ffe2e5e53576998e3650c1d", - - # sdl will be needed for native windows - "third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9b526d28cb2d7f0ccff0613c94bb52abc8f53b6f", - - # microhttpd for skiaserve - "third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d", - - # imgui for Viewer/SampleApp widgets - "third_party/externals/imgui" : "https://github.com/ocornut/imgui.git@6384eee34f08cb7eab8d835043e1738e4adcdf75", + "buildtools" : "https://chromium.googlesource.com/chromium/buildtools.git@55ad626b08ef971fd82a62b7abb325359542952b", + "common" : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@57f17473791703ac82add77c3d77d13d8e2dfbc4", + "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", + "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55", + "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@08fd250e1af0aa16d18012d39462e6ca9bbc6e90", + "third_party/externals/harfbuzz" : "https://skia.googlesource.com/third_party/harfbuzz.git@1.4.2", + "third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@ec9c1133693148470ffe2e5e53576998e3650c1d", + "third_party/externals/imgui" : "https://github.com/ocornut/imgui.git@6384eee34f08cb7eab8d835043e1738e4adcdf75", + "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", + "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@6de58e0d28014caf2fc1370145f22fd6d65f63e3", + "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.6.0", + "third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d", + "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a", + "third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9b526d28cb2d7f0ccff0613c94bb52abc8f53b6f", + "third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916", + #"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", + "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633", } recursedeps = [ "common" ] - -hooks = [] - -import os -import sys -if os.path.exists('bin/fetch-gn'): - hooks.append({ 'action': [sys.executable, 'bin/fetch-gn'] }) -- 2.7.4