From f75fddcdf169c18ab1ad8966befa0a4fb2f3a365 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Wed, 22 Apr 2015 07:47:51 -0700
Subject: [PATCH] Update unit test make files to use BoringSSL

Merge from widevine of go://wvgerrit/14173

This CL updates the android makefiles to use the libcrypto_static.

Change-Id: I74567ff880ebdce366766a9ab44c92cc9540b8db
---
 libwvdrmengine/Android.mk                        | 2 +-
 libwvdrmengine/build_and_run_all_unit_tests.sh   | 4 ++++
 libwvdrmengine/cdm/test/unit-test.mk             | 2 +-
 libwvdrmengine/mediacrypto/test/Android.mk       | 2 +-
 libwvdrmengine/mediadrm/test/Android.mk          | 2 +-
 libwvdrmengine/oemcrypto/mock/Android.mk         | 4 ++--
 libwvdrmengine/oemcrypto/test/common.mk          | 4 ++--
 libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 1 -
 libwvdrmengine/test/unit/Android.mk              | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index a4359a7c..e0ea383b 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -81,12 +81,12 @@ LOCAL_C_INCLUDES := \
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_utils \
+  libcrypto_static \
   libwvlevel3 \
   libwvdrmcryptoplugin \
   libwvdrmdrmplugin \
 
 LOCAL_SHARED_LIBRARIES := \
-  libcrypto \
   libcutils \
   libdl \
   liblog \
diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index 21019293..9fdd61de 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -13,6 +13,10 @@ cd $ANDROID_BUILD_TOP/external/gtest/
 pwd
 mm
 
+cd $ANDROID_BUILD_TOP/external/boringssl
+pwd
+mm
+
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
 pwd
 mm
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 5417ba78..94c342cb 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -32,6 +32,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
 LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
+    libcrypto_static \
     libgmock \
     libgtest \
     libgtest_main \
@@ -39,7 +40,6 @@ LOCAL_STATIC_LIBRARIES := \
     libcdm_utils \
 
 LOCAL_SHARED_LIBRARIES := \
-    libcrypto \
     libcutils \
     libdl \
     liblog \
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index d5a2f79f..ca589488 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -18,6 +18,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
+  libcrypto_static \
   libgmock \
   libgmock_main \
   libgtest \
@@ -25,7 +26,6 @@ LOCAL_STATIC_LIBRARIES := \
   libwvdrmcryptoplugin \
 
 LOCAL_SHARED_LIBRARIES := \
-  libcrypto \
   libcutils \
   libdl \
   liblog \
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index 98c73b4f..c4ee490d 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -19,6 +19,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
+  libcrypto_static \
   libgmock \
   libgmock_main \
   libgtest \
@@ -26,7 +27,6 @@ LOCAL_STATIC_LIBRARIES := \
   libwvdrmdrmplugin \
 
 LOCAL_SHARED_LIBRARIES := \
-  libcrypto \
   libcutils \
   libdl \
   liblog \
diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libwvdrmengine/oemcrypto/mock/Android.mk
index 8dd99580..816578c5 100644
--- a/libwvdrmengine/oemcrypto/mock/Android.mk
+++ b/libwvdrmengine/oemcrypto/mock/Android.mk
@@ -25,7 +25,6 @@ LOCAL_C_INCLUDES += \
     external/openssl/include/openssl \
 
 LOCAL_SHARED_LIBRARIES := \
-    libcrypto \
     libcutils \
     libdl \
     liblog \
@@ -33,7 +32,8 @@ LOCAL_SHARED_LIBRARIES := \
     libz \
 
 LOCAL_STATIC_LIBRARIES := \
-    libcdm_utils
+    libcdm_utils \
+    libcrypto_static \
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
 LOCAL_MODULE := liboemcrypto
diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk
index b012d777..44e0841e 100644
--- a/libwvdrmengine/oemcrypto/test/common.mk
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -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 \
+
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 4925fb91..4e6739a8 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -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>
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index 5e2fa5d9..26c171ab 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -15,11 +15,11 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
+  libcrypto_static \
   libgtest \
   libgtest_main \
 
 LOCAL_SHARED_LIBRARIES := \
-  libcrypto \
   libdl \
   liblog \
   libutils \