From 574e6d533aa76eafd1d941a1c989384256570cc4 Mon Sep 17 00:00:00 2001 From: Renjie Tang Date: Mon, 13 Nov 2023 16:01:38 -0800 Subject: [PATCH 1/2] split proguard rules Signed-off-by: Renjie Tang --- mobile/library/BUILD | 5 ++++- mobile/library/java_proto_proguard.txt | 11 +++++++++++ mobile/library/proguard.txt | 12 ------------ 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 mobile/library/java_proto_proguard.txt diff --git a/mobile/library/BUILD b/mobile/library/BUILD index e581fc891e27..ab2f3c61317c 100644 --- a/mobile/library/BUILD +++ b/mobile/library/BUILD @@ -2,6 +2,9 @@ licenses(["notice"]) # Apache 2 filegroup( name = "proguard_rules", - srcs = ["proguard.txt"], + srcs = [ + "java_proto_proguard.txt", + "proguard.txt", + ], visibility = ["//visibility:public"], ) diff --git a/mobile/library/java_proto_proguard.txt b/mobile/library/java_proto_proguard.txt new file mode 100644 index 000000000000..d0c755f70833 --- /dev/null +++ b/mobile/library/java_proto_proguard.txt @@ -0,0 +1,11 @@ +-keep class com.google.protobuf.** { + *; +} + +-keep class com.google.protobuf.MessageLite { + *; +} + +-keep class com.google.protobuf.MessageLite$Builder { + *; +} diff --git a/mobile/library/proguard.txt b/mobile/library/proguard.txt index 9e38653bc635..f160d16cf28f 100644 --- a/mobile/library/proguard.txt +++ b/mobile/library/proguard.txt @@ -60,15 +60,3 @@ -keep class io.envoyproxy.envoymobile.engine.types.EnvoyLogger { ; } - --keep class com.google.protobuf.** { - *; -} - --keep class com.google.protobuf.MessageLite { - *; -} - --keep class com.google.protobuf.MessageLite$Builder { - *; -} From 6074d370c7fb25b7d13a0b7423cafdee2fbda99d Mon Sep 17 00:00:00 2001 From: Renjie Tang Date: Wed, 6 Mar 2024 15:22:08 -0800 Subject: [PATCH 2/2] change EM buffer size Signed-off-by: Renjie Tang --- mobile/library/common/http/client.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/library/common/http/client.cc b/mobile/library/common/http/client.cc index b8b8e3153f12..9ee1f1df4bee 100644 --- a/mobile/library/common/http/client.cc +++ b/mobile/library/common/http/client.cc @@ -121,10 +121,10 @@ void Client::DirectStreamCallbacks::encodeData(Buffer::Instance& data, bool end_ response_data_ = std::make_unique( [this]() -> void { onBufferedDataDrained(); }, [this]() -> void { onHasBufferedData(); }, []() -> void {}); - // Default to 1M per stream. This is fairly arbitrary and will result in + // Default to 2M per stream. This is fairly arbitrary and will result in // Envoy buffering up to 1M + flow-control-window for HTTP/2 and HTTP/3, - // and having local data of 1M + kernel-buffer-limit for HTTP/1.1 - response_data_->setWatermarks(1000000); + // and having local data of 2M + kernel-buffer-limit for HTTP/1.1 + response_data_->setWatermarks(2 * 1024 * 1024); } // Send data if in default flow control mode, or if resumeData has been called in explicit