2a371dce54
[ Merge of http://go/wvgerrit/150789 ] We had two copies of the wvcrc32.h and wvcrc.cpp files: One in oemcrypto/util/ and one in oemcrypto/test/. The two were identical except for the namespaces used. However, this setup created confusion if the compiler could see both files, as the wrong one could get included. This patch removes the set from test/ in favor of the more-widely-used set from util/ and updates the one piece of code using the old namespace. Update Android oemcrypto_test makefile for wvcrc32. [ Merge of http://go/wvgerrit/153657 ] Duplicated wvcrc files were removed in http://go/wvgerrit/150632, however, the Android-specific makefile for oemcrypto_test was not updated with the new source and include directory. This CL makes the necessary changes to the makefile to build with the OEC ref util version of wvcrc32. Bug: 229160397 Bug: 236317198 Test: oemcrypto_test Change-Id: I0b53255122172fb514e7e0602b59f3ab704e52da
66 lines
1.6 KiB
Makefile
66 lines
1.6 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
|
|
WV_UNITTESTS_BUILD_TARGET?=
|
|
ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
|
|
HIDL_EXTENSION := _hidl
|
|
LIB_BINDER := libhidlbase
|
|
else
|
|
HIDL_EXTENSION :=
|
|
LIB_BINDER := libbinder_ndk
|
|
endif
|
|
|
|
ifeq ($(filter mips mips64, $(TARGET_ARCH)),)
|
|
# Tests need to be compatible with devices that do not support gnu hash-style
|
|
LOCAL_LDFLAGS+=-Wl,--hash-style=both
|
|
endif
|
|
|
|
# The unit tests can access v15 functions through the dynamic adapter:
|
|
LOCAL_CFLAGS += -DTEST_OEMCRYPTO_V15
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
oec_device_features.cpp \
|
|
oec_decrypt_fallback_chain.cpp \
|
|
oec_key_deriver.cpp \
|
|
oec_session_util.cpp \
|
|
oemcrypto_corpus_generator_helper.cpp \
|
|
oemcrypto_session_tests_helper.cpp \
|
|
oemcrypto_test.cpp \
|
|
oemcrypto_test_android.cpp \
|
|
oemcrypto_test_main.cpp \
|
|
ota_keybox_test.cpp \
|
|
../../cdm/util/test/test_sleep.cpp \
|
|
../util/src/wvcrc.cpp \
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
$(LOCAL_PATH)/fuzz_tests \
|
|
$(LOCAL_PATH)/../include \
|
|
$(LOCAL_PATH)/../odk/include \
|
|
$(LOCAL_PATH)/../odk/kdo/include \
|
|
$(LOCAL_PATH)/../ref/src \
|
|
$(LOCAL_PATH)/../util/include \
|
|
vendor/widevine/libwvdrmengine/cdm/core/include \
|
|
vendor/widevine/libwvdrmengine/cdm/util/include \
|
|
vendor/widevine/libwvdrmengine/cdm/util/test \
|
|
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libcdm \
|
|
libgtest \
|
|
libgtest_main \
|
|
libwvlevel3 \
|
|
libcdm_protos \
|
|
libcdm_utils$(HIDL_EXTENSION) \
|
|
libwv_kdo \
|
|
libwv_odk \
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbase \
|
|
libcrypto \
|
|
libdl \
|
|
$(LIB_BINDER) \
|
|
liblog \
|
|
libmedia_omx \
|
|
libprotobuf-cpp-lite \
|
|
libstagefright_foundation \
|
|
libutils \
|
|
libz \
|