widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace _hidl_ with _hal_ in test names

Browse Source 
[ Merged from http://go/wvgerrit/148451 ]

This step is a prelude in adding Widevine unit tests that
use AIDL interface.

Test: ./build_and_run_all_unit_tests.sh
Bug: 217247987
Change-Id: I449050819e6c9b0261066997dd45a6103b3a9a7a
This commit is contained in:
Edwin Wong
2022-03-22 17:38:20 +00:00
committed by Edwin
parent dddd1142de
commit 0f3c297250
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/build_all_unit_tests.sh
View File

@@ -56,9 +56,9 @@ WV_TEST_TARGETS="base64_test \
http_socket_test \ http_socket_test \
initialization_data_unittest \ initialization_data_unittest \
keybox_ota_test \ keybox_ota_test \
libwvdrmdrmplugin_hidl_test \ libwvdrmdrmplugin_hal_test \
libwvdrmengine_hidl_test \ libwvdrmengine_hal_test \
libwvdrmmediacrypto_hidl_test \ libwvdrmmediacrypto_hal_test \
license_keys_unittest \ license_keys_unittest \
license_unittest \ license_unittest \
metrics_collections_unittest \ metrics_collections_unittest \

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -1,6 +1,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Builds libwvdrmmediacrypto_hidl_test # Builds libwvdrmmediacrypto_hal_test
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -54,7 +54,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
external/protobuf/src \ external/protobuf/src \
LOCAL_MODULE := libwvdrmmediacrypto_hidl_test LOCAL_MODULE := libwvdrmmediacrypto_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only LOCAL_LICENSE_CONDITIONS := by_exception_only

4
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Builds libwvdrmdrmplugin_hidl_test # Builds libwvdrmdrmplugin_hal_test
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -56,7 +56,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
external/protobuf/src \ external/protobuf/src \
LOCAL_MODULE := libwvdrmdrmplugin_hidl_test LOCAL_MODULE := libwvdrmdrmplugin_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only LOCAL_LICENSE_CONDITIONS := by_exception_only

6
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -111,8 +111,8 @@ adb_shell_run generic_crypto_unittest
adb_shell_run hidl_metrics_adapter_unittest adb_shell_run hidl_metrics_adapter_unittest
adb_shell_run http_socket_test adb_shell_run http_socket_test
adb_shell_run initialization_data_unittest adb_shell_run initialization_data_unittest
adb_shell_run libwvdrmdrmplugin_hidl_test adb_shell_run libwvdrmdrmplugin_hal_test
adb_shell_run libwvdrmmediacrypto_hidl_test adb_shell_run libwvdrmmediacrypto_hal_test
adb_shell_run license_keys_unittest adb_shell_run license_keys_unittest
adb_shell_run license_unittest adb_shell_run license_unittest
adb_shell_run odk_test adb_shell_run odk_test
@@ -131,5 +131,5 @@ adb_shell_run wv_cdm_metrics_test
# Run the Treble test on Treble devices # Run the Treble test on Treble devices
if adb $SERIAL_NUM shell ls /vendor/lib/libwvhidl.so &> /dev/null || if adb $SERIAL_NUM shell ls /vendor/lib/libwvhidl.so &> /dev/null ||
adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then
adb_shell_run libwvdrmengine_hidl_test adb_shell_run libwvdrmengine_hal_test
fi fi

4
libwvdrmengine/test/unit/Android.mk
View File

@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Builds libwvdrmengine_hidl_test # Builds libwvdrmengine_hal_test
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_HEADER_LIBRARIES := \ LOCAL_HEADER_LIBRARIES := \
libstagefright_foundation_headers \ libstagefright_foundation_headers \
LOCAL_MODULE := libwvdrmengine_hidl_test LOCAL_MODULE := libwvdrmengine_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only LOCAL_LICENSE_CONDITIONS := by_exception_only

6
tests/Android.mk
View File

@@ -32,9 +32,9 @@ WIDEVINE_TEST_MAKE_TARGETS += \
http_socket_test \ http_socket_test \
initialization_data_unittest \ initialization_data_unittest \
keybox_ota_test \ keybox_ota_test \
libwvdrmdrmplugin_hidl_test \ libwvdrmdrmplugin_hal_test \
libwvdrmengine_hidl_test \ libwvdrmengine_hal_test \
libwvdrmmediacrypto_hidl_test \ libwvdrmmediacrypto_hal_test \
license_keys_unittest \ license_keys_unittest \
license_unittest \ license_unittest \
metrics_collections_unittest \ metrics_collections_unittest \