Artem Titov 739351d476 Roll chromium_revision 95336cb92b..191d55580e (557816:557824)
Change log: 95336cb92b..191d55580e
Full diff: 95336cb92b..191d55580e

Roll chromium third_party 4e16929f46..3a8f2a9e1e
Change log: 4e16929f46..3a8f2a9e1e

Changed dependencies:
* src/tools: c44a3f5eca..f524a53b81
DEPS diff: 95336cb92b..191d55580e/DEPS

No update to Clang.

TBR=titovartem@google.com,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal

Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e
Reviewed-on: https://webrtc-review.googlesource.com/76120
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23205}
2018-05-11 11:17:05 +00:00

32 lines
847 B
Diff

diff -rupN ./man/Makefile ../cups-1.5.3-patched/man/Makefile
--- ./man/Makefile 2014-01-31 20:19:55.000000000 +0400
+++ ../cups-1.5.3-patched/man/Makefile 2014-01-31 20:21:56.449781676 +0400
@@ -69,6 +69,12 @@ MAN8 = cupsaccept.$(MAN8EXT) \
LANGUAGES=de fr
+# Man pages build may fail. We don't need those in instrumented builds anyway.
+MAN1 =
+MAN5 =
+MAN7 =
+MAN8 =
+
#
# Make everything...
#
diff -rupN ./man/Makefile.l10n ../cups-1.5.3-patched/man/Makefile.l10n
--- ./man/Makefile.l10n 2014-01-31 20:19:55.000000000 +0400
+++ ../cups-1.5.3-patched/man/Makefile.l10n 2014-01-31 20:22:13.889535988 +0400
@@ -57,6 +57,11 @@ MAN8 = cupsaccept.$(MAN8EXT) \
lpmove.$(MAN8EXT) \
lpc.$(MAN8EXT)
+# Man pages build may fail. We don't need those in instrumented builds anyway.
+MAN1 =
+MAN5 =
+MAN7 =
+MAN8 =
#
# Make everything...