From 683202e1d42d2642f7471272b4a3b5d64525a7bf Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 22 Jan 2015 17:14:35 -0800 Subject: Remove superfluous OpenSSL include paths. The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e --- drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk | 3 +-- .../plugins/forward-lock/internal-format/common/Android.mk | 3 --- .../plugins/forward-lock/internal-format/converter/Android.mk | 3 +-- .../plugins/forward-lock/internal-format/decoder/Android.mk | 3 +-- drm/mediadrm/plugins/clearkey/Android.mk | 1 - drm/mediadrm/plugins/clearkey/tests/Android.mk | 1 - 6 files changed, 3 insertions(+), 11 deletions(-) (limited to 'drm') diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index 48b0afe..933464f 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk @@ -58,8 +58,7 @@ LOCAL_C_INCLUDES += \ $(base)/drm/libdrmframework/plugins/forward-lock/internal-format/common \ $(base)/drm/libdrmframework/plugins/forward-lock/internal-format/converter \ $(base)/drm/libdrmframework/plugins/forward-lock/internal-format/decoder \ - $(LOCAL_PATH)/include \ - external/openssl/include + $(LOCAL_PATH)/include LOCAL_MODULE_RELATIVE_PATH := drm diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk index 6c5d3cf..3b4c8b4 100644 --- a/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk @@ -20,9 +20,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ FwdLockGlue.c -LOCAL_C_INCLUDES := \ - external/openssl/include - LOCAL_SHARED_LIBRARIES := libcrypto LOCAL_MODULE := libfwdlock-common diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk index 8f08c88..2f51f0c 100644 --- a/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk @@ -21,8 +21,7 @@ LOCAL_SRC_FILES := \ FwdLockConv.c LOCAL_C_INCLUDES := \ - frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common \ - external/openssl/include + frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common LOCAL_SHARED_LIBRARIES := libcrypto diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk index 7b493c3..3399ae5 100644 --- a/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk @@ -21,8 +21,7 @@ LOCAL_SRC_FILES := \ FwdLockFile.c LOCAL_C_INCLUDES := \ - frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common \ - external/openssl/include + frameworks/av/drm/libdrmframework/plugins/forward-lock/internal-format/common LOCAL_SHARED_LIBRARIES := libcrypto 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 \ -- cgit v1.1