diff options
| author | Kenny Root <kroot@google.com> | 2015-01-26 18:58:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 18:58:03 +0000 |
| commit | 64b08d230c94872e014831bdb7b8a323c4b584ec (patch) | |
| tree | 37ea4b732b315e61d893cd054a0ac7818024fd07 /drm/mediadrm | |
| parent | 252a9101480d7a554476f0f680710fcab13d1369 (diff) | |
| parent | cbb803a57f8bbfbdcc3e9857d16a38a47106a26c (diff) | |
| download | frameworks_av-64b08d230c94872e014831bdb7b8a323c4b584ec.zip frameworks_av-64b08d230c94872e014831bdb7b8a323c4b584ec.tar.gz frameworks_av-64b08d230c94872e014831bdb7b8a323c4b584ec.tar.bz2 | |
am cbb803a5: Merge "Remove superfluous OpenSSL include paths."
* commit 'cbb803a57f8bbfbdcc3e9857d16a38a47106a26c':
Remove superfluous OpenSSL include paths.
Diffstat (limited to 'drm/mediadrm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/Android.mk | 1 | ||||
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/tests/Android.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk index b713a7f..2efdcf5 100644 --- a/drm/mediadrm/plugins/clearkey/Android.mk +++ b/drm/mediadrm/plugins/clearkey/Android.mk @@ -32,7 +32,6 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ external/jsmn \ - external/openssl/include \ frameworks/av/drm/mediadrm/plugins/clearkey \ frameworks/av/include \ frameworks/native/include \ diff --git a/drm/mediadrm/plugins/clearkey/tests/Android.mk b/drm/mediadrm/plugins/clearkey/tests/Android.mk index 80f94e0..392f218 100644 --- a/drm/mediadrm/plugins/clearkey/tests/Android.mk +++ b/drm/mediadrm/plugins/clearkey/tests/Android.mk @@ -29,7 +29,6 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ external/jsmn \ - external/openssl/include \ frameworks/av/drm/mediadrm/plugins/clearkey \ frameworks/av/include \ frameworks/native/include \ |