aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHadrien Zalek <hzalek@google.com>2020-06-19 17:04:02 -0700
committerHadrien Zalek <hzalek@google.com>2020-06-29 20:25:32 -0700
commitb6ad5d62b22ed3f9507bfe4a765380096824b1f7 (patch)
tree9b07a9fabea0b821e23e65408e67eb4ceae8fcc7
parent2bf353cc2616f27364a158b2683f8d0d20c77b70 (diff)
downloadplatform_external_grpc-grpc-java-b6ad5d62b22ed3f9507bfe4a765380096824b1f7.tar.gz
platform_external_grpc-grpc-java-b6ad5d62b22ed3f9507bfe4a765380096824b1f7.tar.bz2
platform_external_grpc-grpc-java-b6ad5d62b22ed3f9507bfe4a765380096824b1f7.zip
Remove gRPC Netty shaded static library
Remove the build module for the shaded library which causes issues at runtime due to missing symbols. This happens because the jar is prebuilt from an older version of gRPC and is no longer compatible with the current source. Additionally, the grpc-java module should not statically link against a specific transport jar that contains service providers. Doing so forces an automatically-loaded implementation on users. Test: m grpc-java Bug: 148404241 Change-Id: I77589c05756b55146648d726ea6e235f1887ac38
-rw-r--r--Android.bp1
-rw-r--r--netty/shaded/Android.bp22
-rw-r--r--netty/shaded/grpc-netty-shaded-1.14.0.jarbin6401211 -> 0 bytes
3 files changed, 0 insertions, 23 deletions
diff --git a/Android.bp b/Android.bp
index 37c6c8f2e..3b61d0847 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,6 @@ java_library_host {
"grpc-java-core-inprocess",
"grpc-java-core-internal",
"grpc-java-core-util",
- "grpc-java-netty-shaded",
"grpc-java-protobuf",
"grpc-java-protobuf-lite",
"grpc-java-stub",
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
deleted file mode 100644
index 346371f1e..000000000
--- a/netty/shaded/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// TODO: Build from source instead
-java_import_host {
- name: "grpc-java-netty-shaded",
- jars: [
- "grpc-netty-shaded-1.14.0.jar",
- ],
-}
diff --git a/netty/shaded/grpc-netty-shaded-1.14.0.jar b/netty/shaded/grpc-netty-shaded-1.14.0.jar
deleted file mode 100644
index 230b7de90..000000000
--- a/netty/shaded/grpc-netty-shaded-1.14.0.jar
+++ /dev/null
Binary files differ