Use intermediate variables for TF-PSA-Crypto's contribution to LOCAL_CFLAGS

Define these intermediate variables in the crypto helper file.

No behavior change except possibly an inconsequential reordering of compiler
options.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

scripts/common.make

@@ -27,8 +27,8 @@ LDFLAGS ?=
 
 LOCAL_CFLAGS = $(WARNING_CFLAGS) -I$(MBEDTLS_TEST_PATH)/include \
                -I$(MBEDTLS_PATH)/framework/tests/include \
-               -I$(MBEDTLS_PATH)/include -I$(MBEDTLS_PATH)/tf-psa-crypto/include \
-               -I$(MBEDTLS_PATH)/tf-psa-crypto/drivers/builtin/include \
+               -I$(MBEDTLS_PATH)/include \
+               $(TF_PSA_CRYPTO_LIBRARY_PUBLIC_INCLUDE) \
                -D_FILE_OFFSET_BITS=64
 LOCAL_CXXFLAGS = $(WARNING_CXXFLAGS) $(LOCAL_CFLAGS)
 

scripts/crypto-common.make

@@ -32,3 +32,16 @@ THIRDPARTY_DIR := $(TF_PSA_CRYPTO_PATH)/drivers
 THIRDPARTY_INCLUDES =
 include $(TF_PSA_CRYPTO_PATH)/drivers/everest/Makefile.inc
 include $(TF_PSA_CRYPTO_PATH)/drivers/p256-m/Makefile.inc
+
+# Directories with headers of public interfaces of TF-PSA-Crypto
+TF_PSA_CRYPTO_LIBRARY_PUBLIC_INCLUDE = \
+	-I$(TF_PSA_CRYPTO_PATH)/include \
+	-I$(TF_PSA_CRYPTO_PATH)/drivers/builtin/include \
+	$(THIRDPARTY_INCLUDES)
+
+# Directories with headers of internal interfaces of TF-PSA-Crypto
+# (currently consumed by Mbed TLS, eventually not so when we've finished
+# cleaning up)
+TF_PSA_CRYPTO_LIBRARY_PRIVATE_INCLUDE = \
+	-I$(TF_PSA_CRYPTO_PATH)/core \
+	-I$(TF_PSA_CRYPTO_PATH)/drivers/builtin/src