Roll chromium_revision d323a482ee..7114a66134 (494468:497367) manually
* Enable workaround for building Android with C++14.
* Disable build hooks for WebRTC on Android.
Change log: https://chromium.googlesource.com/chromium/src/+log/d323a482ee..7114a66134
Full diff: https://chromium.googlesource.com/chromium/src/+/d323a482ee..7114a66134
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/66d3c08e82..0b41aca75a
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/2a5e6515a5..a2a451d3c0
* src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/ceb050498e..5af0a3a8b8
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2085f316c1..0a0ac63bd3
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3127a16731..8a25f55d8b
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/b4122f732f..8c0e65fa05
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/f4ecc84644..ae9f0616c5
* src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/d27175a044..f8acf3b642
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/6d0d04458d..e081cbe5aa
* src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/98218d1e92..08cb956852
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/cbb83ba4aa..6b9c691daf
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/5730fb2d3f..3e167a7bd3
DEPS diff: https://chromium.googlesource.com/chromium/src/+/d323a482ee..7114a66134/DEPS
No update to Clang.
TBR=marpan@webrtc.org,
BUG=webrtc:8148
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
Review-Url: https://codereview.webrtc.org/3003393002
Cr-Original-Commit-Position: refs/heads/master@{#19517}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 474accebdbd125cab606befee59294d3eb7ef2bf
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 7978f13..3d49bc3 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -62,6 +62,9 @@
]
shared_libraries = [ "../sdk/android:libjingle_peerconnection_so" ]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
android_library("AppRTCMobile_javalib") {
@@ -100,6 +103,9 @@
"../sdk/android:libjingle_peerconnection_metrics_default_java",
"androidapp/third_party/autobanh:autobanh_java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
android_resources("AppRTCMobile_resources") {
@@ -123,6 +129,9 @@
"//third_party/android_support_test_runner:runner_java",
"//third_party/junit",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") {
@@ -146,6 +155,9 @@
data = [
"../../resources/reference_video_640x360_30fps.y4m",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
}
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index cffc0c1..87cf8d5 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -357,5 +357,8 @@
deps = [
"../../rtc_base:base_java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
}
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index d26d5e7..ee85a63 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1065,5 +1065,8 @@
"java/src/org/webrtc/Size.java",
"java/src/org/webrtc/ThreadUtils.java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
}
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index b79e414..429d3ff 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -451,6 +451,9 @@
"../../modules/audio_device:audio_device_java",
"../../rtc_base:base_java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
android_library("libjingle_peerconnection_metrics_default_java") {
@@ -459,6 +462,9 @@
deps = [
"../../rtc_base:base_java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
if (rtc_include_tests) {
@@ -502,5 +508,8 @@
]
shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
}
diff --git a/test/BUILD.gn b/test/BUILD.gn
index e0601ec..9dd2472 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -717,5 +717,8 @@
"../rtc_base:base_java",
"//testing/android/native_test:native_test_java",
]
+
+ # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
+ no_build_hooks = true
}
}
