Issue %3020 - Part 9: Second pass remove android defines and build system stuff.

Mostly IPC, tools and mozbuild.

6 files changed, 9 insertions, 19 deletions

diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index fbe73c545..514a0d6be 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -127,8 +127,8 @@ Library::Create(JSContext* cx, HandleValue path, const JSCTypesCallbacks* callba
       return nullptr;
 
   } else {
-    // Fallback: assume the platform native charset is UTF-8. This is true
-    // for Mac OS X, Android, and probably Linux.
+    // Fallback: assume the platform native charset is UTF-8.
+    // This is true on most flavors of Linux.
     size_t nbytes =
       GetDeflatedUTF8StringLength(cx, pathStrChars.twoByteChars(), pathStr->length());
     if (nbytes == (size_t) -1)
diff --git a/js/src/ctypes/libffi/config.sub b/js/src/ctypes/libffi/config.sub
index 9633db704..8b468b066 100755
--- a/js/src/ctypes/libffi/config.sub
+++ b/js/src/ctypes/libffi/config.sub
@@ -115,7 +115,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
@@ -123,10 +123,6 @@ case $maybe_os in
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -1365,7 +1361,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -mingw32* | -mingw64* | -linux-gnu* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
diff --git a/js/src/jit/PerfSpewer.cpp b/js/src/jit/PerfSpewer.cpp
index d428a8f92..3ac1ae24b 100644
--- a/js/src/jit/PerfSpewer.cpp
+++ b/js/src/jit/PerfSpewer.cpp
@@ -21,12 +21,6 @@
 
 #include "vm/MutexIDs.h"
 
-// perf expects its data to be in a file /tmp/perf-PID.map, but for Android
-// and B2G the map files are written to /data/local/tmp/perf-PID.map
-//
-// Except that Android 4.3 no longer allows the browser to write to /data/local/tmp/
-// so also try /sdcard/.
-
 #ifndef PERF_SPEW_DIR
 #  define PERF_SPEW_DIR "/tmp/"
 #endif
diff --git a/js/src/jsutil.cpp b/js/src/jsutil.cpp
index 6370e8ef0..db0eb9287 100644
--- a/js/src/jsutil.cpp
+++ b/js/src/jsutil.cpp
@@ -103,7 +103,6 @@ AllTheNonBasicVanillaNewAllocations()
 {
     // posix_memalign and aligned_alloc aren't available on all Linux
     // configurations.
-    // valloc was deprecated in Android 5.0
     //char* q;
     //posix_memalign((void**)&q, 16, 16);
 
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 2da5b5269..370682396 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -988,7 +988,7 @@ AC_LANG_CPLUSPLUS
 MOZ_CXX11
 
 case "${OS_TARGET}" in
-WINNT|Darwin|Android)
+WINNT|Darwin)
   ;;
 *)
   STL_FLAGS="-I${DIST}/stl_wrappers"
@@ -1605,11 +1605,11 @@ dnl = Enable jemalloc
 dnl ========================================================
 
 case "${OS_TARGET}" in
-Android|WINNT|Darwin)
+WINNT|Darwin)
   MOZ_GLUE_IN_PROGRAM=
   ;;
 *)
-  dnl On !Android !Windows !OSX, we only want to link executables against mozglue
+  dnl On !Windows, we only want to link executables against mozglue
   MOZ_GLUE_IN_PROGRAM=1
   AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
   ;;
diff --git a/js/src/threading/posix/ConditionVariable.cpp b/js/src/threading/posix/ConditionVariable.cpp
index fe768eae3..57c2a13c1 100644
--- a/js/src/threading/posix/ConditionVariable.cpp
+++ b/js/src/threading/posix/ConditionVariable.cpp
@@ -157,8 +157,9 @@ js::ConditionVariable::wait_for(UniqueLock<Mutex>& lock,
 
   r = pthread_cond_timedwait(ptCond, ptMutex, &abs_ts);
 #else
-  // Our non-clock-supporting platforms, OS X and Android, do support waiting
+  // Our non-clock-supporting platforms do support waiting
   // on a condition variable with a relative timeout.
+  // XXXMC: This was in use on Android and OSX. Can probably be removed.
   r = pthread_cond_timedwait_relative_np(ptCond, ptMutex, &rel_ts);
 #endif