From 8e31c7f4459d488dddf0d74693061dc964280edd Mon Sep 17 00:00:00 2001
From: Kyle Alexander <kylealexander@google.com>
Date: Thu, 19 Feb 2015 14:11:45 -0800
Subject: [PATCH] Makefile to support building XtsOEMCryptoTestCases module

This makefile will be linked to from the vendor/xts project,
and defines how to build the oemcrypto_unittest executable into
an xts compatible native test.

Bug: 18952052
Change-Id: I8158cad703b558b88070cc46dafcf109699ecc77
---
 libwvdrmengine/oemcrypto/test/Android.mk | 32 ++----------------------
 libwvdrmengine/oemcrypto/test/XtsTest.mk | 13 ++++++++++
 libwvdrmengine/oemcrypto/test/common.mk  | 30 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 libwvdrmengine/oemcrypto/test/XtsTest.mk
 create mode 100644 libwvdrmengine/oemcrypto/test/common.mk

diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk
index f6efc65b..29cfde69 100644
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libwvdrmengine/oemcrypto/test/Android.mk
@@ -3,39 +3,11 @@ LOCAL_PATH:= $(call my-dir)
 # THIS IS FOR THE MOCK TESTS:
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:= \
-  oemcrypto_test.cpp
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_C_INCLUDES += \
-  external/gtest/include \
-  external/openssl/include \
-  $(LOCAL_PATH)/../include \
-  $(LOCAL_PATH)/../mock/src \
-  vendor/widevine/libwvdrmengine/cdm/core/include \
-  vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
-
-LOCAL_STATIC_LIBRARIES := \
-  libcdm \
-  libcdm_utils \
-  libgtest_ndk \
-  libgtest_main_ndk \
-  libwvlevel3 \
-  libcdm_utils \
-
-LOCAL_SHARED_LIBRARIES := \
-  libcrypto \
-  libcutils \
-  libdl \
-  liblog \
-  libutils \
-  libz \
-
 LOCAL_MODULE:=oemcrypto_test
+LOCAL_MODULE_TAGS := tests
 
 LOCAL_MODULE_TARGET_ARCH := arm mips x86
 
-LOCAL_CXX_STL := stlport
+include $(LOCAL_PATH)/common.mk
 
 include $(BUILD_EXECUTABLE)
diff --git a/libwvdrmengine/oemcrypto/test/XtsTest.mk b/libwvdrmengine/oemcrypto/test/XtsTest.mk
new file mode 100644
index 00000000..e6ef7a92
--- /dev/null
+++ b/libwvdrmengine/oemcrypto/test/XtsTest.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := XtsOEMCryptoTestCases
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)
+
+LOCAL_XTS_TEST_PACKAGE := google.oemcrypto
+
+include $(LOCAL_PATH)/common.mk
+
+include $(BUILD_XTS_EXECUTABLE)
diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk
new file mode 100644
index 00000000..3aa4ec23
--- /dev/null
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -0,0 +1,30 @@
+LOCAL_PATH:= $(call my-dir)
+
+LOCAL_SRC_FILES:= \
+  oemcrypto_test.cpp
+
+LOCAL_C_INCLUDES += \
+  external/gtest/include \
+  external/openssl/include \
+  $(LOCAL_PATH)/../include \
+  $(LOCAL_PATH)/../mock/src \
+  vendor/widevine/libwvdrmengine/cdm/core/include \
+  vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
+
+LOCAL_STATIC_LIBRARIES := \
+  libcdm \
+  libcdm_utils \
+  libgtest_ndk \
+  libgtest_main_ndk \
+  libwvlevel3 \
+  libcdm_utils \
+
+LOCAL_SHARED_LIBRARIES := \
+  libcrypto \
+  libcutils \
+  libdl \
+  liblog \
+  libutils \
+  libz \
+
+LOCAL_CXX_STL := stlport