diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 22:51:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 22:51:18 +0000 |
| commit | 2f702c9bc0d07f5d48f6f50586b1e11d9ac59381 (patch) | |
| tree | 519ddfbf39c4eb23ebaeda790eec1c860df62197 /drm | |
| parent | 7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731 (diff) | |
| parent | 43e10bb74913a9c9e739c1d4cacbed9be885ffa7 (diff) | |
| download | frameworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.zip frameworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.tar.gz frameworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.tar.bz2 | |
am 43e10bb7: Merge "Move to libc++."
* commit '43e10bb74913a9c9e739c1d4cacbed9be885ffa7':
Move to libc++.
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/Android.mk | 1 | ||||
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/tests/Android.mk | 8 |
2 files changed, 0 insertions, 9 deletions
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) |