commit 3a2e300ddef8b046136a931d632c0671fa1c930f
author Tim Murray <timmurray@google.com> Fri Apr 25 14:33:27 2014 -0700
committer Tim Murray <timmurray@google.com> Fri Apr 25 14:33:27 2014 -0700
tree e3f9b16a7405c7f71ca70b57a2bd235cb1f74701
parent e06531cb423e22775a3f42fbf5d80282f10c43ed

Fix build break caused by MCLinker rebase.

Conflicts:
        lib/Script/Android.mk

Change-Id: If03a9d3d75d6a17cbe7ec7a70d6585146c5edbe6

lib/Script/ScriptParser.yy

diff --git a/lib/Script/ScriptParser.yy b/lib/Script/ScriptParser.yy
index fc3e667..745a4ef 100644
--- a/lib/Script/ScriptParser.yy
+++ b/lib/Script/ScriptParser.yy
@@ -38,7 +38,11 @@
 
 %require "2.4"
 %skeleton "glr.cc"
+/*
+ * BEGIN android-removed: prevent bison from generating the header in current directory
 %defines "ScriptParser.h"
+ * END android-removed
+ */
 %debug
 %error-verbose
 %define namespace "mcld"