summaryrefslogtreecommitdiff
path: root/include/mcld/Script
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2016-03-08 00:18:09 -0800
committerStephen Hines <srhines@google.com>2016-03-20 22:56:38 -0700
commitcfcb22478ca64c308df58f9abe6fa2dedb213c16 (patch)
tree86ab1560a7117ab943903579113b5146c992f0c2 /include/mcld/Script
parenta4e968f7c0528fb5bc8d80d83ae0b061f965f2b1 (diff)
downloadmclinker-cfcb22478ca64c308df58f9abe6fa2dedb213c16.tar.gz
Rebase mclinker for LLVM update to r256229.
Bug: http://b/26987366 (cherry picked from commit b0d0eb206527b43c771933602e147bbd7b471082) Change-Id: Ic9018c4cd1579fa95e7ff994996c4cbd589b8e9f
Diffstat (limited to 'include/mcld/Script')
-rw-r--r--include/mcld/Script/ScriptScanner.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mcld/Script/ScriptScanner.h b/include/mcld/Script/ScriptScanner.h
index 4a572a1..da54750 100644
--- a/include/mcld/Script/ScriptScanner.h
+++ b/include/mcld/Script/ScriptScanner.h
@@ -10,7 +10,11 @@
#define MCLD_SCRIPT_SCRIPTSCANNER_H_
#ifndef __FLEX_LEXER_H
-#include "FlexLexer.h"
+#ifdef ANDROID
+#include "mcld/Script/FlexLexer.h"
+#else
+#include <FlexLexer.h>
+#endif
#endif
#ifndef YY_DECL