Update Makefiles and revert changes to config.pl
-Add comments to Makefiles about test env auto-detection
-Fix indentation
-Remove parent folder from include dirs
-Do not use environment variable for defining config file because
env variable usage is not fully implemented
-Revert changes to config.pl
diff --git a/library/Makefile b/library/Makefile
index e0141bf..5ea4063 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -9,17 +9,15 @@
# Otherwise Mbed OS environment is used.
DIR_FOR_MBED_TLS_ENV=../library
ifneq "$(wildcard $(DIR_FOR_MBED_TLS_ENV) )" ""
- # Set include dirs for Mbed TLS test environment
+ # Set include dirs for Mbed TLS test environment
INCLUDE_DIRS=-I../include
else
- # Set include dirs for Mbed OS test environment
- INCLUDE_DIRS=-I.. -I../inc
+ # Set include dirs for Mbed OS test environment
+ INCLUDE_DIRS=-I../inc
+ CFLAGS += "-DMBEDTLS_CONFIG_FILE=\"mbedtls/test_config.h\""
endif
LOCAL_CFLAGS = $(WARNING_CFLAGS) $(INCLUDE_DIRS) -D_FILE_OFFSET_BITS=64
-ifdef MBEDTLS_CONFIG_FILE
-LOCAL_CFLAGS += "-DMBEDTLS_CONFIG_FILE=\"${MBEDTLS_CONFIG_FILE}\""
-endif
LOCAL_LDFLAGS =