aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2020-08-05 10:34:42 -0700
committerAlistair Delva <adelva@google.com>2020-08-13 11:30:20 -0700
commitcbf98c8eb5d9353c2014b07ee677960a8fbdd64e (patch)
tree88f05ffcf25e8799b5c40bb85f2b1898ef51f44e
parent3c3710e89ac92ac69c90f70ba63a52a97fe41746 (diff)
downloadswig-cbf98c8eb5d9353c2014b07ee677960a8fbdd64e.tar.gz
ANDROID: Update parser.h include path
The Android integration of yacc will write the include file out to a non-controllable location based on the path of the source .y file. Update the direct inclusion of this header to match the schema of the Android build system. Bug: 162801433 Change-Id: Ibe288ab4496d2f0dfb98f95c49fcdcfe0776fd23
-rw-r--r--Source/CParse/cscanner.c2
-rw-r--r--Source/Makefile.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index 4566817a0..cb2fdb5dd 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -16,7 +16,7 @@
* ----------------------------------------------------------------------------- */
#include "cparse.h"
-#include "parser.h"
+#include "Source/CParse/parser.h"
#include <string.h>
#include <ctype.h>
diff --git a/Source/Makefile.in b/Source/Makefile.in
index 19db67f71..c82cb4b40 100644
--- a/Source/Makefile.in
+++ b/Source/Makefile.in
@@ -532,7 +532,8 @@ AUTOMAKE_OPTIONS = foreign nostdinc subdir-objects 1.7.2
SOURCE_DIR = $(top_srcdir)/Source
BUILD_SOURCE_DIR = $(top_builddir)/Source
SWIG_CXX_DEFS = @SWILL@
-AM_CPPFLAGS = -I$(BUILD_SOURCE_DIR)/Include \
+AM_CPPFLAGS = -I$(top_builddir) \
+ -I$(BUILD_SOURCE_DIR)/Include \
-I$(BUILD_SOURCE_DIR)/CParse \
-I$(SOURCE_DIR)/Include \
-I$(SOURCE_DIR)/DOH \