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

Merge "Rename conditional flag and remove log spam." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-30 18:41:32 +00:00
committed by Android (Google) Code Review
parent 5e0c55d2f7 2a91e85b91
commit 0a65e3ba32
5 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 \
@@ -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

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