From 11fc63ec42d88fbff6fef24511467c72ee4ee2f8 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 4 Mar 2014 14:50:52 +0000
Subject: Reapply: Makefile changes to get mclinker to build again.

Turns out, bison is pretty inflexible when a %includes file.h is in the
.yy file: it will always generate the code in the current directory. Since
the current directory in an Android build is not out/ we cannot assume we
have write access to that directory.

Therefore, the only option I could find was to change the ScriptParser.yy
file. Not ideal, since this is the only patch on upstream.

Change-Id: I9ee7f56d4f6900e1b566f4a36b31dddc8cb0848e
---
 lib/Script/Android.mk | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 lib/Script/Android.mk

(limited to 'lib/Script/Android.mk')

diff --git a/lib/Script/Android.mk b/lib/Script/Android.mk
new file mode 100644
index 0000000..e24fa35
--- /dev/null
+++ b/lib/Script/Android.mk
@@ -0,0 +1,59 @@
+LOCAL_PATH:= $(call my-dir)
+
+mcld_script_SRC_FILES := \
+  AssertCmd.cpp \
+  Assignment.cpp \
+  BinaryOp.cpp \
+  EntryCmd.cpp \
+  FileToken.cpp \
+  GroupCmd.cpp \
+  InputSectDesc.cpp \
+  InputToken.cpp \
+  NameSpec.cpp \
+  NullaryOp.cpp \
+  Operand.cpp \
+  Operator.cpp \
+  OutputArchCmd.cpp \
+  OutputCmd.cpp \
+  OutputFormatCmd.cpp \
+  OutputSectDesc.cpp \
+  RpnEvaluator.cpp \
+  RpnExpr.cpp \
+  ScriptCommand.cpp \
+  ScriptFile.cpp \
+  ScriptReader.cpp \
+  SearchDirCmd.cpp \
+  SectionsCmd.cpp \
+  ScriptScanner.ll \
+  ScriptParser.yy \
+  StrToken.cpp \
+  StringList.cpp \
+  TernaryOp.cpp \
+  UnaryOp.cpp \
+  WildcardPattern.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mcld_script_SRC_FILES)
+LOCAL_MODULE:= libmcldScript
+LOCAL_C_INCLUDES := $(MCLD_ROOT_PATH)/include/mcld/Script
+
+LOCAL_MODULE_TAGS := optional
+
+include $(MCLD_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mcld_script_SRC_FILES)
+LOCAL_MODULE:= libmcldScript
+LOCAL_C_INCLUDES := $(MCLD_ROOT_PATH)/include/mcld/Script
+
+LOCAL_MODULE_TAGS := optional
+
+include $(MCLD_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)
-- 
cgit v1.2.3