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

Snap for 8385883 from 0a65e3ba32 to tm-release

Browse Source 
Change-Id: I71736f1d22ae083346b4e2a42ace21ca0ce913eb
This commit is contained in:
Android Build Coastguard Worker
2022-03-31 01:20:23 +00:00
parent 1c2144c352 0a65e3ba32
commit e593a23012
10 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libwvdrmengine/build_all_unit_tests.sh
View File

@@ -11,7 +11,7 @@ fi
# copy files to a specific android device by providing a serial number. # copy files to a specific android device by providing a serial number.
# The default build target is for AIDL service, use "-t hidl" to # The default build target is for AIDL service, use "-t hidl" to
# build for HIDL service. # build for HIDL service.
BUILD_TARGET="" WV_UNITTESTS_BUILD_TARGET=""
NUM_CORES=1 NUM_CORES=1
SERIAL_NUM="" SERIAL_NUM=""
while getopts "j:s:t:" opt; do while getopts "j:s:t:" opt; do
@@ -23,7 +23,7 @@ while getopts "j:s:t:" opt; do
SERIAL_NUM="-s $OPTARG" SERIAL_NUM="-s $OPTARG"
;; ;;
t) t)
BUILD_TARGET="BUILD_TARGET=$OPTARG" WV_UNITTESTS_BUILD_TARGET="WV_UNITTESTS_BUILD_TARGET=$OPTARG"
;; ;;
esac esac
done done
@@ -34,7 +34,7 @@ done
# Build all the targets # Build all the targets
# This list is slightly longer than the one in run_all_unit_tests.sh because # This list is slightly longer than the one in run_all_unit_tests.sh because
# it does not run very long tests or tests needing special setup. # it does not run very long tests or tests needing special setup.
WV_TEST_TARGETS="base64_test \ WV_UNITTESTS="base64_test \
buffer_reader_test \ buffer_reader_test \
cdm_coverage_test \ cdm_coverage_test \
cdm_engine_test \ cdm_engine_test \
@@ -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 \
@@ -80,7 +80,7 @@ WV_TEST_TARGETS="base64_test \
cd $ANDROID_BUILD_TOP cd $ANDROID_BUILD_TOP
pwd pwd
m -j $NUM_CORES $WV_TEST_TARGETS $BUILD_TARGET m -j $NUM_CORES $WV_UNITTESTS $WV_UNITTESTS_BUILD_TARGET
# Detect the device and check if Verity is going to stop the script from working # Detect the device and check if Verity is going to stop the script from working
@@ -115,6 +115,6 @@ try_adb_push() {
} }
# Push the tests to the device # Push the tests to the device
for f in $WV_TEST_TARGETS; do for f in $WV_UNITTESTS; do
try_adb_push $f try_adb_push $f
done done

6
libwvdrmengine/cdm/test/coverage-test.mk
View File

@@ -3,13 +3,11 @@
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
BUILD_TARGET?= WV_UNITTESTS_BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl) ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase LIB_BINDER := libhidlbase
else else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION := HIDL_EXTENSION :=
LIB_BINDER := libbinder LIB_BINDER := libbinder
endif endif

6
libwvdrmengine/cdm/test/integration-test.mk
View File

@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
include $(CLEAR_VARS) include $(CLEAR_VARS)
BUILD_TARGET?= WV_UNITTESTS_BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl) ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase LIB_BINDER := libhidlbase
else else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION := HIDL_EXTENSION :=
LIB_BINDER := libbinder LIB_BINDER := libbinder
endif endif

6
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
include $(CLEAR_VARS) include $(CLEAR_VARS)
BUILD_TARGET?= WV_UNITTESTS_BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl) ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase LIB_BINDER := libhidlbase
else else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION := HIDL_EXTENSION :=
LIB_BINDER := libbinder LIB_BINDER := libbinder
endif endif

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/oemcrypto/test/common.mk
View File

@@ -1,12 +1,10 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
BUILD_TARGET?= WV_UNITTESTS_BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl) ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
$(info Building 'oemcrypt_test' for HIDL service.)
HIDL_EXTENSION := _hidl HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase LIB_BINDER := libhidlbase
else else
$(info Building 'oemcrypt_test' for AIDL service.)
HIDL_EXTENSION := HIDL_EXTENSION :=
LIB_BINDER := libbinder LIB_BINDER := libbinder
endif endif

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 \