Snap for 6248272 from 5cfc13e50c to sc-release

Change-Id: Ide0837105bd8b0ab23bd0e32d0694641a8990f9d

libwvdrmengine/build_and_run_all_unit_tests.sh

@@ -93,6 +93,8 @@ try_adb_push() {
   # android-tests.zip requires /data/nativetest, we should use the same
   if [ -f $OUT/data/nativetest/$1 ]; then
     test_file=$OUT/data/nativetest/$1
+  elif [ -f $OUT/data/nativetest/vendor/$1/$1 ]; then
+    test_file=$OUT/data/nativetest/vendor/$1/$1
   else
     echo "I cannot find $1"
     echo "I think it should be in $OUT/data/nativetest"

tests/Android.mk

@@ -34,6 +34,7 @@ WIDEVINE_TEST_MAKE_TARGETS += \
     libwvdrmmediacrypto_test \
     license_keys_unittest \
     license_unittest \
+    odk_test \
     oemcrypto_test \
     policy_engine_constraints_unittest \
     policy_engine_unittest \