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

Merge "Build both AIDL and HIDL targets." into tm-dev am: 9361eb803b

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

Change-Id: Ife41ef2048564aa3ccec11c071a50d9509b64b76
This commit is contained in:
Edwin Wong
2022-03-14 21:10:08 +00:00
committed by Automerger Merge Worker
parent 3ad026ab04 9361eb803b
commit 03cb9e4ba1
5 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,17 @@
#
include $(CLEAR_VARS)
BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase
else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION :=
LIB_BINDER := libbinder
endif
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_MODULE := cdm_coverage_test
@@ -55,7 +66,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils$(HIDL_EXTENSION) \
libjsmn \
libgmock \
libgtest \
@@ -67,7 +78,7 @@ LOCAL_SHARED_LIBRARIES := \
libbase \
libcrypto \
libdl \
libhidlbase \
$(LIB_BINDER) \
liblog \
libmedia_omx \
libprotobuf-cpp-lite \

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

@@ -6,6 +6,17 @@ $(call assert-not-null,test_name)
include $(CLEAR_VARS)
BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase
else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION :=
LIB_BINDER := libbinder
endif
LOCAL_MODULE := $(test_name)
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
@@ -45,7 +56,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils$(HIDL_EXTENSION) \
libjsmn \
libgmock \
libgtest \
@@ -57,7 +68,7 @@ LOCAL_SHARED_LIBRARIES := \
libbase \
libcrypto \
libdl \
libhidlbase \
$(LIB_BINDER) \
liblog \
libmedia_omx \
libprotobuf-cpp-lite \

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

@@ -6,6 +6,17 @@ $(call assert-not-null,test_name)
include $(CLEAR_VARS)
BUILD_TARGET?=
ifeq ($(BUILD_TARGET), hidl)
$(info Building '$(test_name)' for HIDL service.)
HIDL_EXTENSION := _hidl
LIB_BINDER := libhidlbase
else
$(info Building '$(test_name)' for AIDL service.)
HIDL_EXTENSION :=
LIB_BINDER := libbinder
endif
LOCAL_MODULE := $(test_name)
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
@@ -42,7 +53,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils$(HIDL_EXTENSION) \
libjsmn \
libgmock \
libgtest \
@@ -54,6 +65,7 @@ LOCAL_SHARED_LIBRARIES := \
libcrypto \
libdl \
libhidlbase \
$(LIB_BINDER) \
liblog \
libmedia_omx \
libprotobuf-cpp-lite \