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

Commit 8c5a762a authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Link libstatslog_bt statically in bluetooth_stack_with_facade" into main am: a810e19f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3108800



Change-Id: I7511481e78d1b4abdb45371ca0d40777d7f53dea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 784a132a a810e19f

system/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ LOCAL_target_libraries := \ 
	$(TARGET_OUT_SHARED_LIBRARIES)/liblzma.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libprotobuf-cpp-full.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libssl.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libstatslog_bt.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libunwindstack.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libutils.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libz.so \

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

+0 −1
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ class GdAndroidDevice(GdDeviceBase): 
        self.push_or_die(*generate_dir_pair(local_dir, self.DEVICE_LIB_DIR, "libprotobuf-cpp-full.so"))

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

        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, "libstatslog_bt.so"))

        self.push_or_die(

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

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

system/gd/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -348,12 +348,13 @@ cc_binary { 
                "libbinder_ndk",

                "libcutils",

                "libhidlbase",

                "libstatslog_bt",

                "libstatssocket",

                "libutils",

            ],

            static_libs: [

                "android.system.suspend-V1-ndk",

                "android.system.suspend.control-V1-ndk",

                "libstatslog_bt",

            ],

        },

        host: {