Popen and shared library init are broken on Android 2.3

Author: pelya

android/build.sh

@@ -421,6 +421,8 @@ $BUILDDIR/setCrossEnvironment.sh \
 --host=$TARGET_HOST \
 --disable-arm-iwmmxt
 
+sed -i "s/TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR/DISABLE_TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR/g" config.h
+
 cd pixman
 touch *.S
 

android/setCrossEnvironment-armeabi-v7a.sh

@@ -23,7 +23,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
 GCCVER=4.8
-PLATFORMVER=android-14
+PLATFORMVER=android-9
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then
 	LOCAL_PATH=`realpath $LOCAL_PATH`

android/setCrossEnvironment-armeabi.sh

@@ -23,7 +23,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
 GCCVER=4.8
-PLATFORMVER=android-14
+PLATFORMVER=android-9
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then
 	LOCAL_PATH=`realpath $LOCAL_PATH`

android/setCrossEnvironment-mips.sh

@@ -23,7 +23,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=mipsel-linux-android
 GCCVER=4.8
-PLATFORMVER=android-14
+PLATFORMVER=android-9
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then
 	LOCAL_PATH=`realpath $LOCAL_PATH`

android/setCrossEnvironment-x86.sh

@@ -23,7 +23,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=i686-linux-android
 GCCVER=4.8
-PLATFORMVER=android-14
+PLATFORMVER=android-9
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then
 	LOCAL_PATH=`realpath $LOCAL_PATH`

os/utils.c

@@ -1244,6 +1244,9 @@ OsAbort (void)
 int
 System(char *command)
 {
+#ifdef ANDROID
+	return system(command);
+#else
     int pid, p;
     void (*csig)(int);
     int status;
@@ -1281,6 +1284,7 @@ System(char *command)
     }
 
     return p == -1 ? -1 : status;
+#endif
 }
 
 static struct pid {
@@ -1294,6 +1298,9 @@ OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
 pointer
 Popen(char *command, char *type)
 {
+#ifdef ANDROID
+	return popen(command, type);
+#else
     struct pid *cur;
     FILE *iop;
     int pdes[2], pid;
@@ -1374,6 +1381,7 @@ Popen(char *command, char *type)
     DebugF("Popen: `%s', fp = %p\n", command, iop);
 
     return iop;
+#endif
 }
 
 /* fopen that drops privileges */
@@ -1471,6 +1479,9 @@ Fopen(char *file, char *type)
 int
 Pclose(pointer iop)
 {
+#ifdef ANDROID
+	return pclose(iop);
+#else
     struct pid *cur, *last;
     int pstat;
     int pid;
@@ -1503,6 +1514,7 @@ Pclose(pointer iop)
     }
 
     return pid == -1 ? -1 : pstat;
+#endif
 }
 
 int

xkb/ddxLoad.c

@@ -205,16 +205,23 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
 	}
     }
 
+	out = fopen("x-keyboard.txt", "w");
+	if (out) {
+		XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
+		fclose(out);
+	}
+
     if (asprintf(&buf,
-		 "%s%sxkbcomp -I%s/usr/share/X11/xkb -w %d %s -xkm %s "
-		  "-em1 %s -emp %s -eml %s %s%s.xkm",
+		 "cat x-keyboard.txt | %s%sxkbcomp -I%s/usr/share/X11/xkb -w %d %s -xkm %s "
+		  "-em1 %s -emp %s -eml %s %s%s.xkm 2>%s/popen-stderr.txt",
 		 xkbbindir, xkbbindirsep,
 		 (getenv("SECURE_STORAGE_DIR") ? getenv("SECURE_STORAGE_DIR") : ""),
 		 ((xkbDebugFlags < 2) ? 1 :
 		  ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
 		 xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
 		 PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
-		 xkm_output_dir, keymap) == -1)
+		 xkm_output_dir, keymap,
+		 (getenv("SECURE_STORAGE_DIR") ? getenv("SECURE_STORAGE_DIR") : ".")) == -1)
 	buf = NULL;
 
     free(xkbbasedirflag);
@@ -237,7 +244,6 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
        XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
     }
 #endif
-	XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
 #ifndef WIN32
 	if (Pclose(out)==0)
 #else