Merge branch 'bugfix/ssl_dependent' into 'refactor'

wujiangang · wujiangang · commit 135fbd671bb8 · 2018-04-12T18:15:40.000+08:00
feat(ssl): Make current openssl wrap enabled when using mbedTLS

See merge request sdk/ESP8266_RTOS_SDK!62
diff --git a/components/ssl/component.mk b/components/ssl/component.mk
@@ -1,15 +1,16 @@
 #
 # Component Makefile
 #
+
+ifdef CONFIG_SSL_USING_MBEDTLS
 COMPONENT_ADD_INCLUDEDIRS := openssl/include
 COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl openssl/include/platform
 
 COMPONENT_SRCDIRS := openssl/source/library openssl/source/platform
 
-ifdef CONFIG_SSL_USING_MBEDTLS
 COMPONENT_ADD_INCLUDEDIRS += mbedtls/include
 COMPONENT_SRCDIRS += mbedtls/source/library mbedtls/source/platform
 else
-COMPONENT_ADD_INCLUDEDIRS += axtls/include
-COMPONENT_SRCDIRS += axtls/source/ssl axtls/source/crypto
+COMPONENT_ADD_INCLUDEDIRS := axtls/include
+COMPONENT_SRCDIRS := axtls/source/ssl axtls/source/crypto
 endif
