aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoopa Sattiraju <sattiraju@google.com>2022-02-02 06:14:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-02 06:14:48 +0000
commit532228f9a2b4a9ea12efb91da3eed16523f45bb0 (patch)
treeb749e7580e3ff85d3ad939c9e9e41ce7b609ddc7
parent2f05786f94f96d08ecb8bd6ee32f7e7f3c8a7d6e (diff)
parent8fbea1b09bc9e07cf456511adea8a8db5ef42f85 (diff)
downloadgrpc-grpc-532228f9a2b4a9ea12efb91da3eed16523f45bb0.tar.gz
libz has to be a shared library as the apex complains that it cannot be am: 2ca8ec0dff am: a365cb9dd6 am: 7c2b657b58 am: 8fbea1b09b
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1967165 Change-Id: I717312156d030cc54e5edb7da527f78201de91df
-rw-r--r--Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index bd547c9568..5f160560dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,9 @@ cc_defaults {
"//apex_available:platform",
"com.android.bluetooth",
],
+ shared_libs: [
+ "libz",
+ ],
stl: "libc++",
min_sdk_version: "30"
}
@@ -963,7 +966,6 @@ cc_library_static {
],
whole_static_libs: [
"libgrpc_trace",
- "libz",
],
shared_libs: [
"liblog",