From b1c48d3d83a2282957261b542be27026fa0c4520 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Fri, 23 Nov 2018 14:45:43 +0000 Subject: [PATCH] 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. --- programs/Makefile | 2 ++ tests/Makefile | 1 + 2 files changed, 3 insertions(+) diff --git a/programs/Makefile b/programs/Makefile index d379ddf20..c88a6c715 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -16,6 +16,8 @@ LOCAL_LDFLAGS = -L../library \ ifdef USE_CRYPTO_SUBMODULE LOCAL_LDFLAGS += -L../crypto/library +LOCAL_CFLAGS += -I../crypto/include +LOCAL_CXXFLAGS += -I../crypto/include endif ifndef SHARED diff --git a/tests/Makefile b/tests/Makefile index 4118c1439..78670c3fa 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,6 +14,7 @@ LOCAL_LDFLAGS = -L../library \ ifdef USE_CRYPTO_SUBMODULE LOCAL_LDFLAGS += -L../crypto/library +LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ else CRYPTO := ../library/