Create a single test binary.
To run individual test suite, follow the example shown below:
adb shell LD_LIBRARY_PATH=/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest
--gtest_filter=JsonWebKeyTest.*
Change-Id: I8ecc944a734cde351505a7cd8c3997976d74553b
diff --git a/drm/mediadrm/plugins/clearkey/tests/Android.mk b/drm/mediadrm/plugins/clearkey/tests/Android.mk
index 0c895ea..ac5bb21 100644
--- a/drm/mediadrm/plugins/clearkey/tests/Android.mk
+++ b/drm/mediadrm/plugins/clearkey/tests/Android.mk
@@ -18,17 +18,35 @@
#
LOCAL_PATH := $(call my-dir)
-test_name := JsonWebKeyUnittest
-test_src_dir := .
-include $(LOCAL_PATH)/unit-test.mk
+include $(CLEAR_VARS)
+LOCAL_MODULE := ClearKeyDrmUnitTest
+LOCAL_MODULE_TAGS := tests
-test_name := AesCtrDecryptorUnittest
-test_src_dir := .
-include $(LOCAL_PATH)/unit-test.mk
+LOCAL_SRC_FILES := \
+ AesCtrDecryptorUnittest.cpp \
+ InitDataParserUnittest.cpp \
+ JsonWebKeyUnittest.cpp \
-test_name := InitDataParserUnittest
-test_src_dir := .
-include $(LOCAL_PATH)/unit-test.mk
+LOCAL_C_INCLUDES := \
+ bionic \
+ external/gtest/include \
+ external/jsmn \
+ external/openssl/include \
+ external/stlport/stlport \
+ frameworks/av/drm/mediadrm/plugins/clearkey \
+ frameworks/av/include \
+ frameworks/native/include \
-test_name :=
-test_src_dir :=
+LOCAL_STATIC_LIBRARIES := \
+ libgtest \
+ libgtest_main \
+
+LOCAL_SHARED_LIBRARIES := \
+ libcrypto \
+ libdrmclearkeyplugin \
+ liblog \
+ libstagefright_foundation \
+ libstlport \
+ libutils \
+
+include $(BUILD_NATIVE_TEST)
diff --git a/drm/mediadrm/plugins/clearkey/tests/unit-test.mk b/drm/mediadrm/plugins/clearkey/tests/unit-test.mk
deleted file mode 100644
index e33ea52..0000000
--- a/drm/mediadrm/plugins/clearkey/tests/unit-test.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# -------------------------------------------------------------------
-# Makes a unit or end to end test.
-# test_name must be passed in as the base filename(without the .cpp).
-#
-$(call assert-not-null,test_name)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(test_name)
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
- $(test_src_dir)/$(test_name).cpp
-
-LOCAL_C_INCLUDES := \
- bionic \
- external/gtest/include \
- external/jsmn \
- external/openssl/include \
- external/stlport/stlport \
- frameworks/av/drm/mediadrm/plugins/clearkey \
- frameworks/av/include \
- frameworks/native/include \
-
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libgtest_main \
-
-LOCAL_SHARED_LIBRARIES := \
- libcrypto \
- libdrmclearkeyplugin \
- liblog \
- libstagefright_foundation \
- libstlport \
- libutils \
-
-include $(BUILD_NATIVE_TEST)