Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbb803a5 authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge "Remove superfluous OpenSSL include paths."

parents 1ed13b3b 683202e1

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -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

drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

drm/mediadrm/plugins/clearkey/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 \