Update unit tests to build into /data/bin

Tradefed needs these tests to be in the /DATA directory.

Test: cd vendor/widevine && ./build_and_run_all_unit_tests
      All tests should build and pass.
      make tests
      unzip android-tests.zip and verify all tests located in DATA/bin

Bug: 62055647
Change-Id: I35925e29558561c4726bb2249499bfee4e54cf45
This commit is contained in:
Kyle Alexander
2017-06-12 23:48:15 -07:00
parent 1857da2c8c
commit 038580c6c9
10 changed files with 106 additions and 75 deletions

View File

@@ -7,35 +7,35 @@ include $(CLEAR_VARS)
# Targets to be included in google_tests.zip
# Referenced by vendor/google/build/tasks/google_tests.mk
WIDEVINE_TEST_MAKE_TARGETS := \
base64_test \
buffer_reader_test \
cdm_engine_test \
cdm_extended_duration_test \
cdm_session_unittest \
device_files_unittest \
distribution_test \
event_metric_test \
file_store_unittest \
file_utils_unittest \
http_socket_test \
initialization_data_unittest \
libwvdrmdrmplugin_hidl_test \
libwvdrmdrmplugin_test \
libwvdrmengine_hidl_test \
libwvdrmengine_test \
libwvdrmmediacrypto_hidl_test \
libwvdrmmediacrypto_test \
license_keys_unittest \
license_unittest \
max_res_engine_unittest \
MediaDrmAPITest \
oemcrypto_test \
policy_engine_constraints_unittest \
policy_engine_unittest \
request_license_test \
service_certificate_unittest \
timer_unittest \
LOCAL_XTS_PATH := vendor/xts/xts-tests/tests/media/Android.mk
# Need to make sure LOCAL_XTS_PATH actually exists in the build environment.
# The gnu wildcard function will return a space-separated list of existing
# files that match one of the given file name patterns. If no existing file
# name matches, then that pattern is omitted from the output of the wildcard
# function. For more details, see:
# https://www.gnu.org/software/make/manual/html_node/Wildcard-Function.html
_xts_makefile := $(strip $(wildcard $(LOCAL_XTS_PATH)))
ifdef _xts_makefile
WIDEVINE_TEST_MAKE_TARGETS += XtsMediaTestCases
include $(_xts_makefile)
endif
usage_table_header_unittest \
CastSignAPITest \
MediaDrmAPITest \
# Call the makefiles for all our tests used in TradeFederation
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
@@ -45,3 +45,4 @@ include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk
include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk
include $(MODULAR_DRM_PATH)/test/unit/Android.mk
include $(MODULAR_DRM_PATH)/test/java/Android.mk
include $(MODULAR_DRM_PATH)/test/castv2/Android.mk