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

Commit 02eddd82 authored by Jizheng Chu's avatar Jizheng Chu
Browse files

Fix device initialization error when run GD cert tests on real device caused by missing lib files 

Test: gd/cert/set_up_and_run_device_cert.sh, observed no failure to initialize objects for controller GdDevice during setup. Please note tests may still fail due to b/190653955.

Change-Id: I81e4f0e189266497f4232a8b8c2939971175c5c9
parent 987da57a

system/gd/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -39,9 +39,13 @@ LOCAL_target_executables := \ 
	$(TARGET_OUT_EXECUTABLES)/bluetooth_stack_with_facade



LOCAL_target_libraries := \

	$(TARGET_OUT_SHARED_LIBRARIES)/android.system.suspend.control-V1-ndk.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libbluetooth_gd.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc++_unsecure.so

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

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc++.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc_wrap.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libstatslog.so

#LINT.ThenChange(cert/run)



bluetooth_cert_src_and_bin_zip := \

system/gd/cert/gd_device.py

+5 −0
Original line number Diff line number Diff line
@@ -420,8 +420,13 @@ class GdAndroidDevice(GdDeviceBase): 
        # Push test binaries

        self.ensure_verity_disabled()

        self.push_or_die(os.path.join(get_gd_root(), "target", "bluetooth_stack_with_facade"), "system/bin")

        self.push_or_die(

            os.path.join(get_gd_root(), "target", "android.system.suspend.control-V1-ndk.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libbluetooth_gd.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc++_unsecure.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc++.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc_wrap.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libstatslog.so"), "system/lib64")



        try:

            self.adb.shell("rm /data/misc/bluetooth/logs/btsnoop_hci.log")

system/gd/cert/set_up_and_run_device_cert.sh

+4 −4
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ fi 
pushd .

cd "${DIR}"

# Reset in case user chooses different item in menu

git checkout android_devices_config.json

git checkout devices_config.json

popd

$DRY_RUN sed -i "s/\"DUT\"/\"${DUT_SERIAL}\"/g" ${DIR}/android_devices_config.json

$DRY_RUN sed -i "s/\"CERT\"/\"${CERT_SERIAL}\"/g" ${DIR}/android_devices_config.json

$DRY_RUN sed -i "s/\"DUT\"/\"${DUT_SERIAL}\"/g" ${DIR}/devices_config.json

$DRY_RUN sed -i "s/\"CERT\"/\"${CERT_SERIAL}\"/g" ${DIR}/devices_config.json



## ACTS

#$DRY_RUN source $(get-android-root)/packages/modules/Bluetooth/system/gd/cert/set_up_acts.sh



## Start test

$DRY_RUN $(get-android-root)/packages/modules/Bluetooth/system/gd/cert/run
 
$DRY_RUN $(get-android-root)/packages/modules/Bluetooth/system/gd/cert/run --device