Merge commit 'remotes/korg/cupcake'
diff --git a/config.h b/config.h
index c220da5..2b3b8a6 100644
--- a/config.h
+++ b/config.h
@@ -65,7 +65,7 @@
#define OP_BINDIR "/usr/local/bin/"
/* package data directory */
-#define OP_DATADIR "/usr/local/share/oprofile/"
+#define OP_DATADIR "/data/oprofile/"
/* Name of package */
#define PACKAGE "oprofile"
@@ -95,7 +95,7 @@
/* #undef TRUE_FALSE_ALREADY_DEFINED */
/* Version number of package */
-#define VERSION "0.9.1"
+#define VERSION "0.9.4"
/* Define to 1 if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
diff --git a/libutil/Android.mk b/libutil/Android.mk
index 29f3bfb..6a7cf5d 100644
--- a/libutil/Android.mk
+++ b/libutil/Android.mk
@@ -7,6 +7,7 @@
op_file.c \
op_fileio.c \
op_get_time.c \
+ op_growable_buffer.c \
op_libiberty.c \
op_lockfile.c \
op_popt.c \