Merge "Updated OEMCrypto tests to use DRM key objects."

This commit is contained in:
Alex Dale
2022-06-21 20:52:08 +00:00
committed by Android (Google) Code Review
7 changed files with 252 additions and 314 deletions

View File

@@ -44,6 +44,8 @@ LOCAL_SRC_FILES := \
../../oemcrypto/test/oec_device_features.cpp \
../../oemcrypto/test/oec_key_deriver.cpp \
../../oemcrypto/test/oec_session_util.cpp \
../../oemcrypto/util/src/oemcrypto_ecc_key.cpp \
../../oemcrypto/util/src/oemcrypto_rsa_key.cpp \
LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/android/cdm/test \
@@ -58,6 +60,7 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/test/fuzz_tests \
vendor/widevine/libwvdrmengine/oemcrypto/odk/include \
vendor/widevine/libwvdrmengine/oemcrypto/odk/kdo/include \
vendor/widevine/libwvdrmengine/oemcrypto/util/include \
LOCAL_C_INCLUDES += external/protobuf/src

View File

@@ -34,6 +34,8 @@ LOCAL_SRC_FILES := \
../../oemcrypto/test/oec_device_features.cpp \
../../oemcrypto/test/oec_key_deriver.cpp \
../../oemcrypto/test/oec_session_util.cpp \
../../oemcrypto/util/src/oemcrypto_ecc_key.cpp \
../../oemcrypto/util/src/oemcrypto_rsa_key.cpp \
../util/test/test_sleep.cpp \
LOCAL_C_INCLUDES := \
@@ -49,6 +51,7 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/test/fuzz_tests \
vendor/widevine/libwvdrmengine/oemcrypto/odk/include \
vendor/widevine/libwvdrmengine/oemcrypto/odk/kdo/include \
vendor/widevine/libwvdrmengine/oemcrypto/util/include \
LOCAL_C_INCLUDES += external/protobuf/src