widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove droidguard disabling

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/131249

We no longer need to disable DroidGuard when running our tests.

Bug: 195770435
Change-Id: Ia17e611dd47e125692abe968dc45d63da81b0a13
This commit is contained in:
Fred Gylys-Colwell
2021-10-13 21:48:38 +00:00
parent 9cab445e2c
commit 6f6ce6a04b
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -60,13 +60,6 @@ adb_shell_run() {
fi fi
} }
# Use Package Manager (via adb shell) to enable or disable DroidGuard.
# Disabling DroidGuard during the test run prevents concurrency issues
# with provisioning status.
set_droidguard() {
adb $SERIAL_NUM shell pm $1 com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService
}
if [ -z "$ANDROID_BUILD_TOP" ]; then if [ -z "$ANDROID_BUILD_TOP" ]; then
echo "Android build environment not set" echo "Android build environment not set"
exit -1 exit -1
@@ -83,9 +76,6 @@ if echo $ADB_OUTPUT | grep -qi "verity"; then
exit -1 exit -1
fi fi
# Disable DroidGuard to prevent provisioning collisions
set_droidguard disable
# Run oemcrypto tests first due to historical test order issues # Run oemcrypto tests first due to historical test order issues
adb_shell_run oemcrypto_test \ adb_shell_run oemcrypto_test \
GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes
@@ -152,6 +142,3 @@ if adb $SERIAL_NUM shell ls /vendor/lib/libwvhidl.so &> /dev/null ||
adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then
adb_shell_run libwvdrmengine_hidl_test adb_shell_run libwvdrmengine_hidl_test
fi fi
# Re-enable DroidGuard
set_droidguard enable