From 05436638acc7c010349a69c3395f1a57c642dc62 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 5 Apr 2013 16:01:00 -0700 Subject: Upgrade bison from 2.3 to 2.7 See README.android for how the upgrade was done. Bug: 8517572 Change-Id: I1e42ab59ff385130a7e488371c6058a13add244d --- Android.mk | 226 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 159 insertions(+), 67 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index f232172c..d5e877a5 100644 --- a/Android.mk +++ b/Android.mk @@ -4,81 +4,173 @@ # Android Asset Packaging Tool # -ifeq ($(HOST_OS),linux) LOCAL_PATH:= $(call my-dir) +########################################### include $(CLEAR_VARS) +LOCAL_MODULE := libbison + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/$(BUILD_OS)-lib \ + $(LOCAL_PATH)/lib + LOCAL_SRC_FILES := \ - lib/abitset.c \ - lib/argmatch.c \ - lib/basename.c \ - lib/bitset.c \ - lib/bitset_stats.c \ - lib/bitsetv-print.c \ - lib/bitsetv.c \ - lib/dirname.c \ - lib/dup-safer.c \ - lib/ebitset.c \ - lib/exitfail.c \ - lib/fd-safer.c \ - lib/fopen-safer.c \ - lib/get-errno.c \ - lib/hard-locale.c \ - lib/hash.c \ - lib/lbitset.c \ - lib/mbswidth.c \ - lib/pipe-safer.c \ - lib/quote.c \ - lib/quotearg.c \ - lib/stripslash.c \ - lib/subpipe.c \ - lib/timevar.c \ - lib/vbitset.c \ - lib/xalloc-die.c \ - lib/xmalloc.c \ - lib/xstrndup.c \ - \ - src/LR0.c \ - src/assoc.c \ - src/closure.c \ - src/complain.c \ - src/conflicts.c \ - src/derives.c \ - src/files.c \ - src/getargs.c \ - src/gram.c \ - src/lalr.c \ - src/location.c \ - src/main.c \ - src/muscle_tab.c \ - src/nullable.c \ - src/output.c \ - src/parse-gram.c \ - src/print.c \ - src/print_graph.c \ - src/reader.c \ - src/reduce.c \ - src/relation.c \ - src/scan-gram-c.c \ - src/scan-skel-c.c \ - src/state.c \ - src/symlist.c \ - src/symtab.c \ - src/tables.c \ - src/uniqstr.c \ - src/vcg.c + lib/abitset.c \ + lib/argmatch.c \ + lib/asnprintf.c \ + lib/basename-lgpl.c \ + lib/basename.c \ + lib/binary-io.c \ + lib/bitrotate.c \ + lib/bitset.c \ + lib/bitset_stats.c \ + lib/bitsetv-print.c \ + lib/bitsetv.c \ + lib/c-ctype.c \ + lib/c-strcasecmp.c \ + lib/c-strncasecmp.c \ + lib/cloexec.c \ + lib/close-stream.c \ + lib/closeout.c \ + lib/dirname-lgpl.c \ + lib/dirname.c \ + lib/dup-safer-flag.c \ + lib/dup-safer.c \ + lib/ebitset.c \ + lib/exitfail.c \ + lib/fatal-signal.c \ + lib/fd-hook.c \ + lib/fd-safer-flag.c \ + lib/fd-safer.c \ + lib/fopen-safer.c \ + lib/fprintf.c \ + lib/fseterr.c \ + lib/get-errno.c \ + lib/hash.c \ + lib/isnand.c \ + lib/isnanf.c \ + lib/isnanl.c \ + lib/lbitset.c \ + lib/localcharset.c \ + lib/math.c \ + lib/mbchar.c \ + lib/mbschr.c \ + lib/mbsrchr.c \ + lib/mbswidth.c \ + lib/mbuiter.c \ + lib/pipe-safer.c \ + lib/pipe2-safer.c \ + lib/pipe2.c \ + lib/printf-args.c \ + lib/printf-frexp.c \ + lib/printf-frexpl.c \ + lib/printf-parse.c \ + lib/printf.c \ + lib/progname.c \ + lib/quotearg.c \ + lib/sig-handler.c \ + lib/snprintf.c \ + lib/spawn-pipe.c \ + lib/sprintf.c \ + lib/stdio.c \ + lib/strerror_r.c \ + lib/stripslash.c \ + lib/strnlen1.c \ + lib/timevar.c \ + lib/unistd.c \ + lib/vasnprintf.c \ + lib/vbitset.c \ + lib/vfprintf.c \ + lib/vsnprintf.c \ + lib/vsprintf.c \ + lib/wait-process.c \ + lib/wctype-h.c \ + lib/xalloc-die.c \ + lib/xmalloc.c \ + lib/xmemdup0.c \ + lib/xsize.c \ + lib/xstrndup.c \ + lib/yyerror.c \ + lib/glthread/lock.c \ + lib/glthread/threadlib.c \ + lib/uniwidth/width.c -LOCAL_MODULE := bison -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true -intermediates := $(call local-intermediates-dir) +ifeq ($(BUILD_OS),darwin) +LOCAL_SRC_FILES += \ + lib/error.c \ + lib/fpending.c \ + lib/getopt.c \ + lib/getopt1.c \ + lib/obstack.c \ + lib/obstack_printf.c \ + lib/open.c \ + lib/perror.c \ + lib/rawmemchr.c \ + lib/stat.c \ + lib/strchrnul.c \ + lib/strerror-override.c \ + lib/strerror.c \ + lib/strverscmp.c \ + lib/wcwidth.c +endif -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DPKGDATADIR=\"$(PWD)/$(LOCAL_PATH)/data\" +ifeq ($(BUILD_OS),linux) +LOCAL_SRC_FILES += \ + lib/fcntl.c +endif + +include $(BUILD_HOST_STATIC_LIBRARY) +########################################### + +include $(CLEAR_VARS) + +LOCAL_MODULE := bison LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/lib + $(LOCAL_PATH)/$(BUILD_OS)-lib \ + $(LOCAL_PATH)/lib -include $(BUILD_HOST_EXECUTABLE) +LOCAL_CFLAGS := -DPKGDATADIR=\"$(PWD)/$(LOCAL_PATH)/data\" -endif +LOCAL_STATIC_LIBRARIES := libbison + +LOCAL_SRC_FILES := \ + src/AnnotationList.c \ + src/InadequacyList.c \ + src/LR0.c \ + src/Sbitset.c \ + src/assoc.c \ + src/closure.c \ + src/complain.c \ + src/conflicts.c \ + src/derives.c \ + src/files.c \ + src/getargs.c \ + src/gram.c \ + src/graphviz.c \ + src/ielr.c \ + src/lalr.c \ + src/location.c \ + src/main.c \ + src/muscle-tab.c \ + src/named-ref.c \ + src/nullable.c \ + src/output.c \ + src/parse-gram.c \ + src/print-xml.c \ + src/print.c \ + src/print_graph.c \ + src/reader.c \ + src/reduce.c \ + src/relation.c \ + src/scan-code-c.c \ + src/scan-gram-c.c \ + src/scan-skel-c.c \ + src/state.c \ + src/symlist.c \ + src/symtab.c \ + src/tables.c \ + src/uniqstr.c + +include $(BUILD_HOST_EXECUTABLE) -- cgit v1.2.3