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

Fix warnings on 64-bit-only builds am: 42fa6275e2

Browse Source 
Change-Id: I05c4ca1d8849636d2950e1d52e4d42a46438dbfc
This commit is contained in:
Automerger Merge Worker
2020-01-30 19:14:58 +00:00
parent aeb41ef5b3 42fa6275e2
commit 80b5b74683
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/Android.mk
View File

@@ -1,12 +1,16 @@
# Build rules for tests to be included in the google_tests.zip package
# are discovered by having an Android.mk file located in vendor/<project>/tests/.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
# Targets to be included in google_tests.zip # Targets to be included in google_tests.zip
# Referenced by vendor/google/build/tasks/google_tests.mk # Referenced by vendor/google/build/tasks/google_tests.mk
WIDEVINE_TEST_MAKE_TARGETS := \ WIDEVINE_TEST_MAKE_TARGETS := \
CastSignAPITest \
MediaDrmAPITest \
# These tests only exist if we're building a 32-bit architecture, or TARGET_ENABLE_MEDIADRM_64
# Importantly, they do not build on 64-bit only configurations that do not set TARGET_ENABLE_MEDIADRM_64
ifneq ($(filter arm x86 true,$(TARGET_ARCH) $(TARGET_2ND_ARCH) $(TARGET_ENABLE_MEDIADRM_64)),)
WIDEVINE_TEST_MAKE_TARGETS += \
base64_test \ base64_test \
buffer_reader_test \ buffer_reader_test \
cdm_engine_test \ cdm_engine_test \
@@ -39,8 +43,8 @@ WIDEVINE_TEST_MAKE_TARGETS := \
usage_table_header_unittest \ usage_table_header_unittest \
value_metric_unittest \ value_metric_unittest \
wv_cdm_metrics_test \ wv_cdm_metrics_test \
CastSignAPITest \
MediaDrmAPITest \ endif
# Call the makefiles for all our tests used in TradeFederation # Call the makefiles for all our tests used in TradeFederation
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine