From f80cc26da78b8221c235875e5954b5e647426640 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Fri, 16 Oct 2015 21:46:56 +0200 Subject: [PATCH] Revert "add gflags to deps to allow command line parameters." This reverts commit 2dd3d9230ee663e71ed4ad9164033ed672e571de. Reason: chromium_git is a missing variable, and to properly add gflags, we need to check in GYP files in third_party/gflags first, then add the DEPS entry. BUG=libyuv:507 TBR=fbarchard@chromium.org Review URL: https://codereview.chromium.org/1406323002 . --- DEPS | 10 ---------- README.chromium | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index b9451276b..b62124629 100644 --- a/DEPS +++ b/DEPS @@ -9,16 +9,6 @@ vars = { 'chromium_revision': 'bb79186c63ff4eff7a2a318a21731005c53f269b', } -# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than -# https; the latter can cause problems for users behind proxies. -deps = { - 'src/third_party/gflags/src': - Var('chromium_git') + '/external/gflags/src@e7390f9185c75f8d902c05ed7d20bb94eb914d0c', # from svn revision 82 -} - -# Define rules for which include paths are allowed in our source. -include_rules = [ '+gflags' ] - hooks = [ { # Clone chromium and its deps. diff --git a/README.chromium b/README.chromium index 286b32991..1573fb635 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1513 +Version: 1512 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index a6877d440..2c6d450e7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1513 +#define LIBYUV_VERSION 1512 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT