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 am: 0a65e3ba32

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17500167

Change-Id: I8e2943b97b5f3e8d5910ef2f00d93bfde30eebd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-03-30 19:01:51 +00:00
committed by Automerger Merge Worker
parent 3c7e5409ac 0a65e3ba32
commit b18b3e20d3
5 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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