summaryrefslogtreecommitdiff
path: root/chromium/third_party/netty4
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/third_party/netty4
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
downloadqtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/netty4')
-rw-r--r--chromium/third_party/netty4/BUILD.gn1
-rw-r--r--chromium/third_party/netty4/proguard.flags5
2 files changed, 6 insertions, 0 deletions
diff --git a/chromium/third_party/netty4/BUILD.gn b/chromium/third_party/netty4/BUILD.gn
index 6a1ac133bc3..8e41b3fa30a 100644
--- a/chromium/third_party/netty4/BUILD.gn
+++ b/chromium/third_party/netty4/BUILD.gn
@@ -12,4 +12,5 @@ android_java_prebuilt("netty_all_java") {
enable_bytecode_checks = false
testonly = true
jar_path = NETTY4_JAR_FILE
+ proguard_configs = [ "proguard.flags" ]
}
diff --git a/chromium/third_party/netty4/proguard.flags b/chromium/third_party/netty4/proguard.flags
new file mode 100644
index 00000000000..0918f876242
--- /dev/null
+++ b/chromium/third_party/netty4/proguard.flags
@@ -0,0 +1,5 @@
+# Netty4 references a number of classes that aren't included in the jar, and are
+# not found in third_party.
+-dontwarn org.jboss.marshalling.**
+-dontwarn org.eclipse.jetty.**
+-dontwarn com.sun.nio.sctp.**