commit 4f055f4ca2a3619268bcc6e6601e4ced2a418fae
author Janos Follath <janos.follath@arm.com> Tue Aug 20 15:12:54 2019 +0100
committer Janos Follath <janos.follath@arm.com> Thu Aug 29 16:12:38 2019 +0100
tree 49f4759e6408346207247d20d363b776e845d249
parent 0c6b79979c7d55dd96cdab2e304142467a424ec1

Use 3rdparty headers from the submodule

programs/Makefile

diff --git a/programs/Makefile b/programs/Makefile
index 0e4f7d6..589b1b5 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -18,8 +18,10 @@
 LOCAL_CFLAGS += -I../crypto/include
 LOCAL_CXXFLAGS += -I../crypto/include
 
-include ../3rdparty/Makefile.inc
-LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
+INCLUDING_FROM_MBEDTLS:=1
+include ../crypto/3rdparty/Makefile.inc
+LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
+LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
 
 ifndef SHARED
 DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
@@ -104,7 +106,7 @@
 endif
 
 fuzz:
-	$(MAKE) -C fuzz
+	$(MAKE) -C fuzz THIRDPARTY_INCLUDES=$(THIRDPARTY_INCLUDES)
 
 $(DEP):
 	$(MAKE) -C ../library

programs/fuzz/Makefile

diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile
index f2195d1..83059aa 100644
--- a/programs/fuzz/Makefile
+++ b/programs/fuzz/Makefile
@@ -8,6 +8,7 @@
 LOCAL_LDFLAGS += -L../../crypto/library
 LOCAL_CFLAGS += -I../../crypto/include
 CRYPTO := ../../crypto/library/
+LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
 
 ifndef SHARED
 DEP=$(CRYPTO)libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a