Roll chromium_revision f8d6ba9..a28d8d5 (337800:346100)
Relevant changes: * src/buildtools: ecc8e25..565d04e * src/testing/gmock: 2976396..0421b6f * src/testing/gtest: 23574bf..9855a87 * src/third_party/android_tools: 21f4bcb..4238a28 * src/third_party/boringssl/src: de24aad..12fe1b2 * src/third_party/icu: c81a1a3..6b3ce81 * src/third_party/libjpeg_turbo: f4631b6..631e2dd * src/third_party/libsrtp: 9c53f85..502e81a * src/third_party/libvpx: aa9b5f1..a208eca * src/third_party/libyuv: 6dde4f1..3c4f573 * src/third_party/openmax_dl: 22bb108..2eb98d8 * src/tools/grit: 1dac9ae..15d48e3 * src/tools/gyp: 5122240..6ee91ad * src/tools/swarming_client: b39a448..2866a22 Details:f8d6ba9..a28d8d5
/DEPS Clang version changed 245402:245965 Details:f8d6ba9..a28d8d5
/tools/clang/scripts/update.sh BUG=None R=glaznev@webrtc.org TBR=glaznev@chromium.org, henrika@chromium.org Review URL: https://codereview.webrtc.org/1308693010 . Cr-Commit-Position: refs/heads/master@{#9818}
This commit is contained in:
2
DEPS
2
DEPS
@ -6,7 +6,7 @@
|
|||||||
vars = {
|
vars = {
|
||||||
'extra_gyp_flag': '-Dextra_gyp_flag=0',
|
'extra_gyp_flag': '-Dextra_gyp_flag=0',
|
||||||
'chromium_git': 'https://chromium.googlesource.com',
|
'chromium_git': 'https://chromium.googlesource.com',
|
||||||
'chromium_revision': 'f8d6ba9efdddfb3aa0dfc01cd579f500a2de0b8d',
|
'chromium_revision': 'a28d8d5a93d2d589bfac8fe77907cba3941b023e',
|
||||||
}
|
}
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
||||||
|
@ -52,10 +52,12 @@ DIRECTORIES = [
|
|||||||
'third_party/libvpx',
|
'third_party/libvpx',
|
||||||
'third_party/libyuv',
|
'third_party/libyuv',
|
||||||
'third_party/llvm-build',
|
'third_party/llvm-build',
|
||||||
|
'third_party/lss',
|
||||||
'third_party/nss',
|
'third_party/nss',
|
||||||
'third_party/ocmock',
|
'third_party/ocmock',
|
||||||
'third_party/openmax_dl',
|
'third_party/openmax_dl',
|
||||||
'third_party/opus',
|
'third_party/opus',
|
||||||
|
'third_party/proguard',
|
||||||
'third_party/protobuf',
|
'third_party/protobuf',
|
||||||
'third_party/sqlite',
|
'third_party/sqlite',
|
||||||
'third_party/syzygy',
|
'third_party/syzygy',
|
||||||
|
@ -11,4 +11,4 @@
|
|||||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-22
|
target=android-23
|
||||||
|
@ -12,9 +12,12 @@
|
|||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
|
// Note: this dependency is dangerous since it reaches into Chromium's
|
||||||
|
// base. You can't include anything in this file that includes WebRTC's
|
||||||
|
// base/checks.h, for instance, since it will clash with Chromium's
|
||||||
|
// logging.h. Therefore, the CHECKs in this file will actually use
|
||||||
|
// Chromium's checks rather than the WebRTC ones.
|
||||||
#include "base/android/jni_android.h"
|
#include "base/android/jni_android.h"
|
||||||
#include "webrtc/base/checks.h"
|
|
||||||
#include "webrtc/modules/audio_device/android/audio_device_template.h"
|
|
||||||
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
|
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
|
||||||
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
|
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
|
||||||
#include "webrtc/modules/utility/interface/jvm_android.h"
|
#include "webrtc/modules/utility/interface/jvm_android.h"
|
||||||
|
@ -22,8 +22,12 @@ void EnsureInitialized() {}
|
|||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
|
// Note: this dependency is dangerous since it reaches into Chromium's
|
||||||
|
// base. You can't include anything in this file that includes WebRTC's
|
||||||
|
// base/checks.h, for instance, since it will clash with Chromium's
|
||||||
|
// logging.h. Therefore, the CHECKs in this file will actually use
|
||||||
|
// Chromium's checks rather than the WebRTC ones.
|
||||||
#include "base/android/jni_android.h"
|
#include "base/android/jni_android.h"
|
||||||
#include "webrtc/base/checks.h"
|
|
||||||
#include "webrtc/modules/video_capture/video_capture_internal.h"
|
#include "webrtc/modules/video_capture/video_capture_internal.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
Reference in New Issue
Block a user