Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2def0df8 authored by Jack He's avatar Jack He
Browse files

Cert: Remove dependency to libgrpc++_unsecure 

* In newer version of libgrpc++, including both libgrpc++ and
  libgrpc++_unsecure will lead to ODR issue where some symbols
  are defined twice
* Since libgrpc++ is inclusive of libgrpc++_unsecure and we need
  features from libgrpc++, we can just remove the dependency to
  libgrpc++_unsecure to fix this ODR issue.
* When this ODR issue occurs, grpc::InsecureServerCredentials()
  will hang indefinitely, causing the test to timeout.
* Reference: https://github.com/grpc/grpc/issues/24422

Bug: 307877650
Test: m bluetooth_stack_with_facade && gd/cert/run --clean SimpleHalTest
Change-Id: I1f196ec44ab90588891d0a371744b3f816667dd9
parent d55051e6

system/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ LOCAL_host_libraries := \ 
	$(HOST_OUT_SHARED_LIBRARIES)/libcutils.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libevent-host.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libflatbuffers-cpp.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libgrpc++_unsecure.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libgrpc++.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libgrpc_wrap.so \

	$(HOST_OUT_SHARED_LIBRARIES)/liblog.so \
@@ -61,7 +60,6 @@ LOCAL_target_libraries := \ 
	$(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libcutils.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc_wrap.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc++_unsecure.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc++.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libhidlbase.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/liblog.so \

system/blueberry/tests/gd/cert/gd_device.py

+0 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ class GdAndroidDevice(GdDeviceBase): 
        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libcutils.so"), overwrite_existing=False)

        self.push_or_die(

            *generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libgrpc_wrap.so"), overwrite_existing=False)

        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libgrpc++_unsecure.so"))

        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libgrpc++.so"))

        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libhidlbase.so"), overwrite_existing=False)

        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "liblog.so"), overwrite_existing=False)

system/gd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ cc_binary { 
    shared_libs: [

        "libcrypto",

        "libgrpc++",

        "libgrpc++_unsecure",

        "libgrpc_wrap",

        "libprotobuf-cpp-full",

        "libunwindstack",

system/gd/cert/run

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ function incremental_venv { 
    cp {$HOST_LIB,$DEST_LIB_DIR}/libchrome.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/libcrypto-host.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/libevent-host.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/libgrpc++_unsecure.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/libgrpc++.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/libgrpc_wrap.so

    cp {$HOST_LIB,$DEST_LIB_DIR}/liblog.so