From 960088ec1038841c8e0bcbcd3466d6dde943c86a Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 2 Mar 2017 18:05:16 -0800 Subject: [PATCH] DEPS: Remove root_dir variable. Due to legacy reasons, libyuv uses a root_dir variable in the DEPS file. It was used to make the bots checkout into a 'src' dir instead of 'libyuv', in order to get some tools working that had hard-coded assumptions on the name 'src' of the top-level directory. This changes all those dirs to be named 'src', which is needed to get tools_libyuv/autoroller/roll_deps.py to work while keeping the buildbot infrastructure working. BUG=libyuv:690 TBR=fbarchard@chromium.org Change-Id: Ia138264d2576e3a9db95efa3de72a14531c92752 Reviewed-on: https://chromium-review.googlesource.com/447913 Reviewed-by: Frank Barchard --- DEPS | 141 ++++++++++++++++++++-------------------- docs/getting_started.md | 14 +--- 2 files changed, 72 insertions(+), 83 deletions(-) diff --git a/DEPS b/DEPS index bff9ac16a..9d2c9c89e 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,4 @@ vars = { - # Override root_dir in your .gclient's custom_vars to specify a custom root - # folder name. - 'root_dir': 'libyuv', 'chromium_git': 'https://chromium.googlesource.com', 'chromium_revision': '6557cd40deb894148068183e4489ca264043d214', 'swarming_revision': 'ebc8dab6f8b8d79ec221c94de39a921145abd404', @@ -16,76 +13,76 @@ vars = { } deps = { - Var('root_dir') + '/build': + 'src/build': Var('chromium_git') + '/chromium/src/build' + '@' + '47e07d6798693fd71c02e25097c97865b5271c40', - Var('root_dir') + '/buildtools': + 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a7cc7a3e21a061975b33dcdcd81a9716ba614c3c', - Var('root_dir') + '/testing': + 'src/testing': Var('chromium_git') + '/chromium/src/testing' + '@' + '178a302b13e943c679f3bbeb0a7e511f7c318404', - Var('root_dir') + '/testing/gtest': + 'src/testing/gtest': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87', - Var('root_dir') + '/testing/gmock': + 'src/testing/gmock': Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566 - Var('root_dir') + '/third_party': + 'src/third_party': Var('chromium_git') + '/chromium/src/third_party' + '@' + '4f196478f68c139a5deec388fd1f426a9251b4b0', - Var('root_dir') + '/third_party/catapult': + 'src/third_party/catapult': Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'), - Var('root_dir') + '/third_party/colorama/src': + 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', - Var('root_dir') + '/third_party/libjpeg_turbo': + 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '7260e4d8b8e1e40b17f03fafdf1cd83296900f76', - Var('root_dir') + '/third_party/yasm/source/patched-yasm': + 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a', - Var('root_dir') + '/tools': + 'src/tools': Var('chromium_git') + '/chromium/src/tools' + '@' + '54fd165044db88eca930ab9d20a6340b76136d91', - Var('root_dir') + '/tools/gyp': + 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563', - Var('root_dir') + '/tools/swarming_client': + 'src/tools/swarming_client': Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), # libyuv-only dependencies (not present in Chromium). - Var('root_dir') + '/third_party/gflags': + 'src/third_party/gflags': Var('chromium_git') + '/external/webrtc/deps/third_party/gflags' + '@' + '892576179b45861b53e04a112996a738309cf364', - Var('root_dir') + '/third_party/gflags/src': + 'src/third_party/gflags/src': Var('chromium_git') + '/external/github.com/gflags/gflags' + '@' + '03bebcb065c83beff83d50ae025a55a4bf94dfca', - Var('root_dir') + '/third_party/gtest-parallel': + 'src/third_party/gtest-parallel': Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + '8768563f5c580f8fc416a13c35c8f23b8a602821', } deps_os = { 'android': { - Var('root_dir') + '/base': + 'src/base': Var('chromium_git') + '/chromium/src/base' + '@' + 'b9d4d9b0e5373bbdb5403c68d51e7385d78a09d0', - Var('root_dir') + '/third_party/android_tools': + 'src/third_party/android_tools': Var('chromium_git') + '/android_tools.git' + '@' + 'b43a6a289a7588b1769814f04dd6c7d7176974cc', - Var('root_dir') + '/third_party/ced/src': + 'src/third_party/ced/src': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '368a9cc09ad868a3d28f0b5ad4a733f263c46409', - Var('root_dir') + '/third_party/icu': + 'src/third_party/icu': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9cd2828740572ba6f694b9365236a8356fd06147', - Var('root_dir') + '/third_party/jsr-305/src': + 'src/third_party/jsr-305/src': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', - Var('root_dir') + '/third_party/junit/src': + 'src/third_party/junit/src': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481', - Var('root_dir') + '/third_party/lss': + 'src/third_party/lss': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'), - Var('root_dir') + '/third_party/mockito/src': + 'src/third_party/mockito/src': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850', - Var('root_dir') + '/third_party/requests/src': + 'src/third_party/requests/src': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', - Var('root_dir') + '/third_party/robolectric/robolectric': + 'src/third_party/robolectric/robolectric': Var('chromium_git') + '/external/robolectric.git' + '@' + 'e38b49a12fdfa17a94f0382cc8ffaf69132fd09b', }, 'ios': { - Var('root_dir') + '/ios': + 'src/ios': Var('chromium_git') + '/chromium/src/ios' + '@' + '291daef6af7764f8475089c65808d52ee50b496e', }, 'unix': { - Var('root_dir') + '/third_party/lss': + 'src/third_party/lss': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'), }, 'win': { # Dependencies used by libjpeg-turbo - Var('root_dir') + '/third_party/yasm/binaries': + 'src/third_party/yasm/binaries': Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881', }, } @@ -99,7 +96,7 @@ pre_deps_hooks = [ # TODO(kjellander): Remove this in March 2017. 'name': 'cleanup_links', 'pattern': '.', - 'action': ['python', Var('root_dir') + '/cleanup_links.py'], + 'action': ['python', 'src/cleanup_links.py'], }, ] @@ -112,11 +109,11 @@ hooks = [ 'pattern': '.', 'action': [ 'python', - Var('root_dir') + '/build/landmines.py', + 'src/build/landmines.py', '--landmine-scripts', - Var('root_dir') + '/tools_libyuv/get_landmines.py', + 'src/tools_libyuv/get_landmines.py', '--src-dir', - Var('root_dir') + '', + 'src', ], }, # Android dependencies. Many are downloaded using Google Storage these days. @@ -130,7 +127,7 @@ hooks = [ # When adding a new sdk extras package to download, add the package # directory and zip file to .gitignore in third_party/android_tools. 'action': ['python', - Var('root_dir') + '/build/android/play_services/update.py', + 'src/build/android/play_services/update.py', 'download' ], }, @@ -138,7 +135,7 @@ hooks = [ 'name': 'intellij', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-intellij', '-l', 'third_party/intellij' @@ -148,7 +145,7 @@ hooks = [ 'name': 'javax_inject', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-javax-inject', '-l', 'third_party/javax_inject' @@ -158,7 +155,7 @@ hooks = [ 'name': 'hamcrest', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-hamcrest', '-l', 'third_party/hamcrest' @@ -168,7 +165,7 @@ hooks = [ 'name': 'guava', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-guava', '-l', 'third_party/guava' @@ -178,7 +175,7 @@ hooks = [ 'name': 'android_support_test_runner', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-android-support-test-runner', '-l', 'third_party/android_support_test_runner' @@ -188,7 +185,7 @@ hooks = [ 'name': 'byte_buddy', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-byte-buddy', '-l', 'third_party/byte_buddy' @@ -198,7 +195,7 @@ hooks = [ 'name': 'espresso', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-espresso', '-l', 'third_party/espresso' @@ -208,7 +205,7 @@ hooks = [ 'name': 'robolectric_libs', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-robolectric', '-l', 'third_party/robolectric' @@ -218,7 +215,7 @@ hooks = [ 'name': 'apache_velocity', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-apache-velocity', '-l', 'third_party/apache_velocity' @@ -228,7 +225,7 @@ hooks = [ 'name': 'ow2_asm', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-ow2-asm', '-l', 'third_party/ow2_asm' @@ -238,7 +235,7 @@ hooks = [ 'name': 'icu4j', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-icu4j', '-l', 'third_party/icu4j' @@ -248,7 +245,7 @@ hooks = [ 'name': 'accessibility_test_framework', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-accessibility-test-framework', '-l', 'third_party/accessibility_test_framework' @@ -258,7 +255,7 @@ hooks = [ 'name': 'bouncycastle', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-bouncycastle', '-l', 'third_party/bouncycastle' @@ -268,7 +265,7 @@ hooks = [ 'name': 'sqlite4java', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-sqlite4java', '-l', 'third_party/sqlite4java' @@ -278,7 +275,7 @@ hooks = [ 'name': 'objenesis', 'pattern': '.', 'action': ['python', - Var('root_dir') + '/build/android/update_deps/update_third_party_deps.py', + 'src/build/android/update_deps/update_third_party_deps.py', 'download', '-b', 'chromium-objenesis', '-l', 'third_party/objenesis' @@ -291,24 +288,24 @@ hooks = [ # official chrome builds or cross compiling. 'name': 'sysroot', 'pattern': '.', - 'action': ['python', Var('root_dir') + '/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', '--running-as-hook'], }, { # Update the Windows toolchain if necessary. 'name': 'win_toolchain', 'pattern': '.', - 'action': ['python', Var('root_dir') + '/build/vs_toolchain.py', 'update'], + 'action': ['python', 'src/build/vs_toolchain.py', 'update'], }, # Pull binutils for linux, enabled debug fission for faster linking / # debugging when used with clang on Ubuntu Precise. # https://code.google.com/p/chromium/issues/detail?id=352046 { 'name': 'binutils', - 'pattern': Var('root_dir') + '/third_party/binutils', + 'pattern': 'src/third_party/binutils', 'action': [ 'python', - Var('root_dir') + '/third_party/binutils/download.py', + 'src/third_party/binutils/download.py', ], }, { @@ -316,14 +313,14 @@ hooks = [ # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang', 'pattern': '.', - 'action': ['python', Var('root_dir') + '/tools/clang/scripts/update.py', '--if-needed'], + 'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'], }, { # Update LASTCHANGE. 'name': 'lastchange', 'pattern': '.', - 'action': ['python', Var('root_dir') + '/build/util/lastchange.py', - '-o', Var('root_dir') + '/build/util/LASTCHANGE'], + 'action': ['python', 'src/build/util/lastchange.py', + '-o', 'src/build/util/LASTCHANGE'], }, # Pull GN binaries. { @@ -334,7 +331,7 @@ hooks = [ '--platform=win32', '--no_auth', '--bucket', 'chromium-gn', - '-s', Var('root_dir') + '/buildtools/win/gn.exe.sha1', + '-s', 'src/buildtools/win/gn.exe.sha1', ], }, { @@ -345,7 +342,7 @@ hooks = [ '--platform=darwin', '--no_auth', '--bucket', 'chromium-gn', - '-s', Var('root_dir') + '/buildtools/mac/gn.sha1', + '-s', 'src/buildtools/mac/gn.sha1', ], }, { @@ -356,7 +353,7 @@ hooks = [ '--platform=linux*', '--no_auth', '--bucket', 'chromium-gn', - '-s', Var('root_dir') + '/buildtools/linux64/gn.sha1', + '-s', 'src/buildtools/linux64/gn.sha1', ], }, # Pull clang-format binaries using checked-in hashes. @@ -368,7 +365,7 @@ hooks = [ '--platform=win32', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', Var('root_dir') + '/buildtools/win/clang-format.exe.sha1', + '-s', 'src/buildtools/win/clang-format.exe.sha1', ], }, { @@ -379,7 +376,7 @@ hooks = [ '--platform=darwin', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', Var('root_dir') + '/buildtools/mac/clang-format.sha1', + '-s', 'src/buildtools/mac/clang-format.sha1', ], }, { @@ -390,7 +387,7 @@ hooks = [ '--platform=linux*', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', Var('root_dir') + '/buildtools/linux64/clang-format.sha1', + '-s', 'src/buildtools/linux64/clang-format.sha1', ], }, # Pull luci-go binaries (isolate, swarming) using checked-in hashes. @@ -402,7 +399,7 @@ hooks = [ '--platform=win32', '--no_auth', '--bucket', 'chromium-luci', - '-d', Var('root_dir') + '/tools/luci-go/win64', + '-d', 'src/tools/luci-go/win64', ], }, { @@ -413,7 +410,7 @@ hooks = [ '--platform=darwin', '--no_auth', '--bucket', 'chromium-luci', - '-d', Var('root_dir') + '/tools/luci-go/mac64', + '-d', 'src/tools/luci-go/mac64', ], }, { @@ -424,7 +421,7 @@ hooks = [ '--platform=linux*', '--no_auth', '--bucket', 'chromium-luci', - '-d', Var('root_dir') + '/tools/luci-go/linux64', + '-d', 'src/tools/luci-go/linux64', ], }, { @@ -434,20 +431,20 @@ hooks = [ # TODO(kjellander): Update comment when GYP is completely cleaned up. 'name': 'instrumented_libraries', 'pattern': '\\.sha1', - 'action': ['python', Var('root_dir') + '/third_party/instrumented_libraries/scripts/download_binaries.py'], + 'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'], }, { 'name': 'clang_format_merge_driver', 'pattern': '.', 'action': [ 'python', - Var('root_dir') + '/tools/clang_format_merge_driver/install_git_hook.py', + 'src/tools/clang_format_merge_driver/install_git_hook.py', ], }, ] recursedeps = [ # buildtools provides clang_format, libc++, and libc++abi. - Var('root_dir') + '/buildtools', + 'src/buildtools', # android_tools manages the NDK. - Var('root_dir') + '/third_party/android_tools', + 'src/third_party/android_tools', ] diff --git a/docs/getting_started.md b/docs/getting_started.md index 46c591b6f..5df4c30db 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -11,13 +11,13 @@ Refer to chromium instructions for each platform for other prerequisites. Create a working directory, enter it, and run: - gclient config https://chromium.googlesource.com/libyuv/libyuv + gclient config --name src https://chromium.googlesource.com/libyuv/libyuv gclient sync Then you'll get a .gclient file like: solutions = [ - { "name" : "libyuv", + { "name" : "src", "url" : "https://chromium.googlesource.com/libyuv/libyuv", "deps_file" : "DEPS", "managed" : True, @@ -35,7 +35,7 @@ Browse the Git reprository: https://chromium.googlesource.com/libyuv/libyuv/+/ma For Android add `;target_os=['android'];` to your Linux .gclient solutions = [ - { "name" : "libyuv", + { "name" : "src", "url" : "https://chromium.googlesource.com/libyuv/libyuv", "deps_file" : "DEPS", "managed" : True, @@ -51,14 +51,6 @@ Then run: export GYP_DEFINES="OS=android" gclient sync -Caveat: Theres an error with Google Play services updates. If you get the error "Your version of the Google Play services library is not up to date", run the following: - - cd chromium/src - ./build/android/play_services/update.py download - cd ../.. - -For Windows the gclient sync must be done from an Administrator command prompt. - The sync will generate native build files for your environment using gyp (Windows: Visual Studio, OSX: XCode, Linux: make). This generation can also be forced manually: `gclient runhooks` To get just the source (not buildable):