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: I53fed0932b9f15b273880810cf38a03ecf6dc274
diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index b33a347..e409952 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -15,16 +15,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-include $(TOP)/external/openssl/flavor.mk
+
+ifneq (,$(wildcard $(TOP)/external/boringssl/flavor.mk))
+ include $(TOP)/external/boringssl/flavor.mk
+else
+ include $(TOP)/external/openssl/flavor.mk
+endif
ifeq ($(OPENSSL_FLAVOR),BoringSSL)
LOCAL_MODULE := libkeystore-engine
LOCAL_SRC_FILES := \
android_engine.cpp
-
- LOCAL_C_INCLUDES += \
- external/openssl/src/include
else
LOCAL_MODULE := libkeystore
diff --git a/keystore/Android.mk b/keystore/Android.mk
index 9dca502..42d05f7 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -22,7 +22,6 @@
endif
LOCAL_CFLAGS := -Wall -Wextra -Werror
LOCAL_SRC_FILES := keystore.cpp keyblob_utils.cpp
-LOCAL_C_INCLUDES := external/openssl/include
LOCAL_SHARED_LIBRARIES := \
libbinder \
libcutils \
@@ -44,7 +43,6 @@
endif
LOCAL_CFLAGS := -Wall -Wextra -Werror
LOCAL_SRC_FILES := keystore_cli.cpp
-LOCAL_C_INCLUDES := external/openssl/include
LOCAL_SHARED_LIBRARIES := libcutils libcrypto libkeystore_binder libutils liblog libbinder
LOCAL_MODULE := keystore_cli
LOCAL_MODULE_TAGS := debug
diff --git a/softkeymaster/Android.mk b/softkeymaster/Android.mk
index 0c733aa..2a0a83f 100644
--- a/softkeymaster/Android.mk
+++ b/softkeymaster/Android.mk
@@ -21,9 +21,7 @@
LOCAL_MODULE := keystore.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := module.cpp
-LOCAL_C_INCLUDES := \
- system/security/keystore \
- external/openssl/include
+LOCAL_C_INCLUDES := system/security/keystore
LOCAL_CFLAGS = -fvisibility=hidden -Wall -Werror
LOCAL_SHARED_LIBRARIES := libcrypto liblog libkeystore_binder libsoftkeymaster
LOCAL_MODULE_TAGS := optional
@@ -36,9 +34,7 @@
endif
LOCAL_MODULE := libsoftkeymaster
LOCAL_SRC_FILES := keymaster_openssl.cpp
-LOCAL_C_INCLUDES := \
- system/security/keystore \
- external/openssl/include
+LOCAL_C_INCLUDES := system/security/keystore
LOCAL_CFLAGS = -fvisibility=hidden -Wall -Werror
LOCAL_SHARED_LIBRARIES := libcrypto liblog libkeystore_binder
LOCAL_MODULE_TAGS := optional