-diff -u -r ../fish-2.1.1/configure ./configure
---- ../fish-2.1.1/configure 2014-09-25 09:11:05.000000000 -0400
-+++ ./configure 2015-02-05 17:35:51.994415663 -0500
-@@ -3221,10 +3221,7 @@
- $as_echo_n "checking if we are compiling against glibc... " >&6; }
+diff -u -r ../fish-2.2.0/configure.ac ./configure.ac
+--- ../fish-2.2.0/configure.ac 2015-07-03 15:46:59.000000000 -0400
++++ ./configure.ac 2015-07-13 02:10:09.284896892 -0400
+@@ -249,6 +249,7 @@
+ )
+ ],
+ [glibc=yes],
++ [glibc=no],
+ [glibc=no]
+ )
+
+@@ -319,14 +320,6 @@
+
+
+ #
+-# See if Linux procfs is present. This is used to get extra
+-# information about running processes.
+-#
+-
+-AC_CHECK_FILES([/proc/self/stat])
+-
+-
+-#
+ # This is ued to tell the wgetopt library to translate strings. This
+ # way wgetopt can be dropped into any project without requiring i18n.
+ #
+@@ -350,8 +343,6 @@
+
+ # Check for os dependant libraries for all binaries.
+ AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
+-AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+-AC_SEARCH_LIBS( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+ AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
+ AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
+ AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
+@@ -559,7 +550,8 @@
+ )
+ ],
+ [have_realpath_null=yes],
+- [have_realpath_null=no]
++ [have_realpath_null=no],
++ [have_realpath_null=yes]
+ )
+
+ if test "$have_realpath_null" = yes; then
+@@ -636,6 +628,9 @@
+ [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
++ ],
++ [
++ AC_MSG_RESULT(no)
+ ]
+ )
- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+ glibc=no
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-@@ -3536,13 +3533,7 @@
- if ${ac_cv_file__proc_self_stat+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "/proc/self/stat"; then
- ac_cv_file__proc_self_stat=yes
--else
-- ac_cv_file__proc_self_stat=no
--fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__proc_self_stat" >&5
- $as_echo "$ac_cv_file__proc_self_stat" >&6; }
-@@ -5218,10 +5209,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if realpath accepts null for its second argument" >&5
- $as_echo_n "checking if realpath accepts null for its second argument... " >&6; }
- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+ have_realpath_null=yes
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-@@ -5330,10 +5318,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fwprintf is broken" >&5
- $as_echo_n "checking if fwprintf is broken... " >&6; }
- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+ echo "no"
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--- /dev/null
+diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
+--- ../fish-2.2.0/env_universal_common.cpp 2015-07-03 15:46:59.000000000 -0400
++++ ./env_universal_common.cpp 2015-07-13 02:16:14.591286575 -0400
+@@ -1089,6 +1089,7 @@
+ return result;
+ }
+
++#ifndef __ANDROID__
+ class universal_notifier_shmem_poller_t : public universal_notifier_t
+ {
+ /* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */
+@@ -1251,6 +1252,7 @@
+ }
+ }
+ };
++#endif
+
+ /* A notifyd-based notifier. Very straightforward. */
+ class universal_notifier_notifyd_t : public universal_notifier_t
+@@ -1572,7 +1574,9 @@
+ } options[] =
+ {
+ {"default", universal_notifier_t::strategy_default},
++#ifndef __ANDROID__
+ {"shmem", universal_notifier_t::strategy_shmem_polling},
++#endif
+ {"pipe", universal_notifier_t::strategy_named_pipe},
+ {"notifyd", universal_notifier_t::strategy_notifyd}
+ };
+@@ -1632,8 +1636,10 @@
+ }
+ switch (strat)
+ {
++#ifndef __ANDROID__
+ case strategy_shmem_polling:
+ return new universal_notifier_shmem_poller_t();
++#endif
+
+ case strategy_notifyd:
+ return new universal_notifier_notifyd_t();
--- /dev/null
+diff -u -r ../fish-2.2.0/fish_tests.cpp ./fish_tests.cpp
+--- ../fish-2.2.0/fish_tests.cpp 2015-07-03 15:46:59.000000000 -0400
++++ ./fish_tests.cpp 2015-07-13 02:17:00.378612789 -0400
+@@ -2572,9 +2572,11 @@
+ assert(0 && "strategy_default should be passed");
+ break;
+
++#ifndef __ANDROID__
+ case universal_notifier_t::strategy_shmem_polling:
+ // nothing required
+ break;
++#endif
+
+ case universal_notifier_t::strategy_notifyd:
+ // notifyd requires a round trip to the notifyd server, which means we have to wait a little bit to receive it
+@@ -2666,7 +2668,9 @@
+ static void test_universal_notifiers()
+ {
+ if (system("mkdir -p /tmp/fish_uvars_test/ && touch /tmp/fish_uvars_test/varsfile.txt")) err(L"mkdir failed");
++#ifndef __ANDROID__
+ test_notifiers_with_strategy(universal_notifier_t::strategy_shmem_polling);
++#endif
+ test_notifiers_with_strategy(universal_notifier_t::strategy_named_pipe);
+ #if __APPLE__
+ test_notifiers_with_strategy(universal_notifier_t::strategy_notifyd);