[ Merge of http://go/wvgerrit/164077 ] This CL makes major changes to the names of variables and types that are related to the usage table, header, entries, entry indexes, and other related data. The renaming followed these rules: 1) "Usage table header" will exclusively refer to the header blob that is OEMCrypto specific. The CDM class "UsageTableHeader" is the CDM-layer's abstraction around the "usage table" concept. The name has been updated to reflect that. 2) The "Cdm" prefix is only used for the CDM-specific data types for the usage table and entry info. It has been removed from OEMCrypto-specific types. - UsageTableHeader -> CdmUsageTable - CdmUsageTableHeader -> UsageTableHeader - CdmUsageEntry -> UsageEntry 3) The "usage_" prefix has been removed from variables when the usage table or usage entries are the subject of the function or class. 4) UsageEntryIndex is the type for entry indexes, instead of directly using uint32_t. This matches how we wrap other types in "wv_cdm_types.h" 5) Changed entry "number" to entry "index". 6) Vectors of elements have been renamed to be either pluralized or have a suffix "_list". 7) "Usage info" was occasionally being used to refer to the usage table or entries generally, rather than specifically secure-stop. - CryptoSession::HasUsageInfoSupport() -> HasUsageTableSupport() The most major change is that the files "usage_table_header*" have been renamed to be "cdm_usage_table*". Bug: 242914226 Test: run_x86_64_tests and request_license_test Change-Id: Iee98446b71f4f2934d3c9e0fb949eb05b84d1f8c
67 lines
2.2 KiB
Makefile
67 lines
2.2 KiB
Makefile
LOCAL_PATH := $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
# Targets to be included in google_tests.zip
|
|
# Referenced by vendor/google/build/tasks/google_tests.mk
|
|
WIDEVINE_TEST_MAKE_TARGETS := \
|
|
CastSignAPITest \
|
|
MediaDrmAPITest \
|
|
|
|
# These tests only exist if we're building a 32-bit architecture, or TARGET_ENABLE_MEDIADRM_64
|
|
# Importantly, they do not build on 64-bit only configurations that do not set TARGET_ENABLE_MEDIADRM_64
|
|
ifneq ($(filter arm x86 true,$(TARGET_ARCH) $(TARGET_2ND_ARCH) $(TARGET_ENABLE_MEDIADRM_64)),)
|
|
WIDEVINE_TEST_MAKE_TARGETS += \
|
|
base64_test \
|
|
buffer_reader_test \
|
|
cdm_coverage_test \
|
|
cdm_engine_metrics_decorator_unittest \
|
|
cdm_engine_test \
|
|
cdm_extended_duration_test \
|
|
cdm_feature_test \
|
|
cdm_session_unittest \
|
|
cdm_usage_table_unittest \
|
|
certificate_provisioning_unittest \
|
|
counter_metric_unittest \
|
|
crypto_session_unittest \
|
|
device_files_unittest \
|
|
distribution_unittest \
|
|
event_metric_unittest \
|
|
file_store_unittest \
|
|
file_utils_unittest \
|
|
generic_crypto_unittest \
|
|
hal_metrics_adapter_unittest \
|
|
http_socket_test \
|
|
initialization_data_unittest \
|
|
keybox_ota_test \
|
|
libwvdrmdrmplugin_hal_test \
|
|
libwvdrmengine_hal_test \
|
|
libwvdrmmediacrypto_hal_test \
|
|
license_keys_unittest \
|
|
license_unittest \
|
|
metrics_collections_unittest \
|
|
odk_test \
|
|
oemcrypto_test \
|
|
okp_fallback_policy_test \
|
|
ota_keybox_provisioner_test \
|
|
policy_engine_constraints_unittest \
|
|
policy_engine_unittest \
|
|
policy_integration_test \
|
|
request_license_test \
|
|
rw_lock_test \
|
|
service_certificate_unittest \
|
|
timer_unittest \
|
|
value_metric_unittest \
|
|
wv_cdm_metrics_test \
|
|
|
|
endif
|
|
|
|
# Call the makefiles for all our tests used in TradeFederation
|
|
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
|
|
include $(MODULAR_DRM_PATH)/cdm/test/Android.mk
|
|
include $(MODULAR_DRM_PATH)/mediacrypto/test/Android.mk
|
|
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/MediaDrmApiTest/Android.mk
|
|
include $(MODULAR_DRM_PATH)/test/castv2/Android.mk
|