Merge "Disable OEMCrypto tests that install a test keybox." into jb-mr2-dev

2013-05-14 05:36:28 +00:00
parent e1151975d0 5d7ac644c5
commit 898d870126
4 changed files with 411 additions and 242 deletions
--- a/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf
+++ b/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libwvdrmengine/oemcrypto/test/Android.mk
@@ -4,8 +4,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)

 LOCAL_SRC_FILES:= \
-  oemcrypto_test.cpp \
-  oemcrypto_keybox_test.cpp
+  oemcrypto_test.cpp

 LOCAL_MODULE_TAGS := tests

--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -8,6 +8,7 @@ fi
 echo "waiting for device"
 adb root && adb wait-for-device remount && adb sync

+adb shell /system/bin/oemcrypto_test
 adb shell /system/bin/request_license_test
 adb shell /system/bin/policy_engine_unittest
 adb shell /system/bin/libwvdrmmediacrypto_test