diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh index 86dd8804..cee2d20c 100755 --- a/libwvdrmengine/run_all_unit_tests.sh +++ b/libwvdrmengine/run_all_unit_tests.sh @@ -26,6 +26,9 @@ elif [ 0 -eq `expr index "$GTEST_FILTER" "-"` ]; then GTEST_FILTER="$GTEST_FILTER-" fi +# The Android supplement allows for installation in these paths: +OEC_PATHS=/vendor/lib64:/vendor/lib + # Execute a command in "adb shell" and capture the result. adb_shell_run() { local test_file=$1 @@ -40,7 +43,7 @@ adb_shell_run() { echo "------ Starting: $test_file" local tmp_log="$OUT/mediadrmtest.log" local adb_error="[ADB SHELL] $@ $test_file failed" - adb $SERIAL_NUM shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log" + adb $SERIAL_NUM shell "LD_LIBRARY_PATH=$OEC_PATHS GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log" ! grep -Fq "$adb_error" "$tmp_log" local result=$? if [ $result -ne 0 ]; then