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