From effaa7832a095c11acedbe488ebbeff296f35ab8 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 10 Nov 2014 14:47:41 -0800 Subject: Move to libc++. This also cleans up some makefile cruft. Bug: 15193147 Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e --- drm/mediadrm/plugins/clearkey/Android.mk | 1 - drm/mediadrm/plugins/clearkey/tests/Android.mk | 8 -------- 2 files changed, 9 deletions(-) (limited to 'drm') diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk index 22a85b4..b713a7f 100644 --- a/drm/mediadrm/plugins/clearkey/Android.mk +++ b/drm/mediadrm/plugins/clearkey/Android.mk @@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \ Utils.cpp \ LOCAL_C_INCLUDES := \ - bionic \ external/jsmn \ external/openssl/include \ frameworks/av/drm/mediadrm/plugins/clearkey \ diff --git a/drm/mediadrm/plugins/clearkey/tests/Android.mk b/drm/mediadrm/plugins/clearkey/tests/Android.mk index ac5bb21..80f94e0 100644 --- a/drm/mediadrm/plugins/clearkey/tests/Android.mk +++ b/drm/mediadrm/plugins/clearkey/tests/Android.mk @@ -28,25 +28,17 @@ LOCAL_SRC_FILES := \ JsonWebKeyUnittest.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) -- cgit v1.1