From 5b980d1c97ca01e209d37c702ebee1b1ea5affca Mon Sep 17 00:00:00 2001 From: kjellander Date: Mon, 19 Sep 2016 01:55:16 -0700 Subject: [PATCH] Revert of Roll chromium_revision cf9457edb7..cede888c27 (416297:419407) (patchset #3 id:40001 of https://codereview.webrtc.org/2348133003/ ) Reason for revert: Reverts a large number of tests downstream, will need more investigation before relanding. Original issue's description: > Roll chromium_revision cf9457edb7..cede888c27 (416297:419407) > > Change log: https://chromium.googlesource.com/chromium/src/+log/cf9457edb7..cede888c27 > Full diff: https://chromium.googlesource.com/chromium/src/+/cf9457edb7..cede888c27 > > Changed dependencies: > * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/adb8bf4e8f..6115afa0ea > * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/bc61769e49..ed6c5d3910 > * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/35740fc7b7..3c7a098821 > * src/third_party/libFuzzer/src: https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer.git/+log/96e97b48e8..eb9b8b0366 > * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/e66cd132f0..4282d29355 > DEPS diff: https://chromium.googlesource.com/chromium/src/+/cf9457edb7..cede888c27/DEPS > > Clang version changed 280106:280836 > Details: https://chromium.googlesource.com/chromium/src/+/cf9457edb7..cede888c27/tools/clang/scripts/update.py > > NOTRY=True > TBR=marpan@webrtc.org, > BUG=None > > Committed: https://crrev.com/afef413cc481dc4a28dff8bdf39cbbc59dfd255e > Cr-Commit-Position: refs/heads/master@{#14282} TBR=ehmaldonado@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review-Url: https://codereview.webrtc.org/2348203002 Cr-Commit-Position: refs/heads/master@{#14284} --- DEPS | 2 +- all.gyp | 3 +-- webrtc/system_wrappers/cpu_features_webrtc.gyp | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 7446956792..5319f56ab4 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'cede888c27275835e5aaadf5dac49379eb3ac106', + 'chromium_revision': 'cf9457edb7c734f509dd12149acd78410c518570', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/all.gyp b/all.gyp index f4920fc06a..0d0926517d 100644 --- a/all.gyp +++ b/all.gyp @@ -39,8 +39,7 @@ 'conditions': [ ['OS=="android" and build_with_chromium==0', { 'dependencies': [ - # No longer supported, please refer to GN targets. - #'webrtc/api/api_java.gyp:*', + 'webrtc/api/api_java.gyp:*', ], }], ['include_tests==1', { diff --git a/webrtc/system_wrappers/cpu_features_webrtc.gyp b/webrtc/system_wrappers/cpu_features_webrtc.gyp index 64aa0624fe..310e3b2448 100644 --- a/webrtc/system_wrappers/cpu_features_webrtc.gyp +++ b/webrtc/system_wrappers/cpu_features_webrtc.gyp @@ -18,8 +18,7 @@ 'source/cpu_features_android.c', ], 'dependencies': [ - # Not supported, please refer to the GN build. - #'../../build/android/ndk.gyp:cpu_features', + '../../build/android/ndk.gyp:cpu_features', ], }, ],