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

Merge "Update unit test make files to use BoringSSL"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2015-04-22 17:35:24 +00:00
committed by Android (Google) Code Review
parent d6da9518ec f75fddcdf1
commit c4d9c1036e
9 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/oemcrypto/test/common.mk
View File

@@ -10,7 +10,6 @@ LOCAL_SRC_FILES:= \
LOCAL_C_INCLUDES += \
external/gtest/include \
external/openssl/include \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../mock/src \
vendor/widevine/libwvdrmengine/cdm/core/include \
@@ -19,15 +18,16 @@ LOCAL_C_INCLUDES += \
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_utils \
libcrypto_static \
libgtest \
libgtest_main \
libwvlevel3 \
libcdm_utils \
LOCAL_SHARED_LIBRARIES := \
libcrypto \
libcutils \
libdl \
liblog \
libutils \
libz \

1
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -17,7 +17,6 @@
#include <gtest/gtest.h>
#include <openssl/aes.h>
#include <openssl/cmac.h>
#include <openssl/err.h>
#include <openssl/hmac.h>
#include <openssl/rand.h>