Include Metric Unit Tests

Merge from Widevine repo of http://go/wvgerrit/23842

This CL updates the android make files and test scripts to include the
two new unit test suites in metrics/test.

Change-Id: Ie31bdc3ae3709ab116d2a340ee5b55c7c12d1d33

libwvdrmengine/build_and_run_all_unit_tests.sh

@@ -68,6 +68,8 @@ try_adb_push $OUT/system/bin/service_certificate_unittest
 try_adb_push $OUT/system/bin/timer_unittest
 try_adb_push $OUT/system/bin/libwvdrmengine_test
 try_adb_push $OUT/system/bin/buffer_reader_test
+try_adb_push $OUT/system/bin/distribution_test
+try_adb_push $OUT/system/bin/event_metric_test
 adb install -r $OUT/system/app/MediaDrmAPITest/MediaDrmAPITest.apk
 
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine

libwvdrmengine/cdm/test/Android.mk

@@ -71,5 +71,13 @@ test_name := timer_unittest
 test_src_dir := .
 include $(LOCAL_PATH)/unit-test.mk
 
+test_name := distribution_test
+test_src_dir := ../metrics/test
+include $(LOCAL_PATH)/unit-test.mk
+
+test_name := event_metric_test
+test_src_dir := ../metrics/test
+include $(LOCAL_PATH)/unit-test.mk
+
 test_name :=
 test_src_dir :=

libwvdrmengine/run_all_unit_tests.sh

@@ -83,6 +83,8 @@ adb_shell_run device_files_unittest
 adb_shell_run service_certificate_unittest
 adb_shell_run timer_unittest
 adb_shell_run buffer_reader_test
+adb_shell_run distribution_test
+adb_shell_run event_metric_test
 
 library_path="/system/vendor/lib/mediadrm/ "
 adb_shell_run libwvdrmengine_test LD_LIBRARY_PATH=$library_path