psa: Include PSA headers for tests and programs

Programs and tests need to be able to use PSA header files when
USE_CRYPTO_SUBMODULE and MBEDTLS_USE_PSA_CRYPTO are set. Add the crypto
submodule include folder, which contains psa headers, after the main
include folder so that psa headers can be found and crypto submodule
headers don't take precedence over mbedtls headers.
This commit is contained in:
Jaeden Amero 2018-11-23 14:45:43 +00:00
parent 46b79c14ad
commit b1c48d3d83
2 changed files with 3 additions and 0 deletions

View file

@ -16,6 +16,8 @@ LOCAL_LDFLAGS = -L../library \
ifdef USE_CRYPTO_SUBMODULE ifdef USE_CRYPTO_SUBMODULE
LOCAL_LDFLAGS += -L../crypto/library LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
LOCAL_CXXFLAGS += -I../crypto/include
endif endif
ifndef SHARED ifndef SHARED

View file

@ -14,6 +14,7 @@ LOCAL_LDFLAGS = -L../library \
ifdef USE_CRYPTO_SUBMODULE ifdef USE_CRYPTO_SUBMODULE
LOCAL_LDFLAGS += -L../crypto/library LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/ CRYPTO := ../crypto/library/
else else
CRYPTO := ../library/ CRYPTO := ../library/