Bug 930454 - Remove --with-android-platform. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Oct 2013 08:23:40 +0900
changeset 165851 88c6e28f4acdb2ad3580ed90c483e2f85c78db71
parent 165850 5dd08c88e328c4b821f5880340d15eaff8b3f92b
child 165852 748863923653a6d0856f0347c59f0a212dbd808a
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs930454
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 930454 - Remove --with-android-platform. r=ted
build/autoconf/android.m4
js/src/build/autoconf/android.m4
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -33,21 +33,16 @@ MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
                           android platform version, default] MIN_ANDROID_VERSION,
     android_version=$withval)
 
 if test $android_version -lt MIN_ANDROID_VERSION ; then
     AC_MSG_ERROR([--with-android-version must be at least MIN_ANDROID_VERSION.])
 fi
 
-MOZ_ARG_WITH_STRING(android-platform,
-[  --with-android-platform=DIR
-                           location of platform dir],
-    android_platform=$withval)
-
 case "$target" in
 arm-linux*-android*|*-linuxandroid*)
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
     android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
@@ -111,39 +106,36 @@ case "$target" in
         else
             AC_MSG_RESULT([$android_toolchain])
         fi
         NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain"
     fi
 
     NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-version=$android_version"
 
-    if test -z "$android_platform" ; then
-        AC_MSG_CHECKING([for android platform directory])
+    AC_MSG_CHECKING([for android platform directory])
 
-        case "$target_cpu" in
-        arm)
-            target_name=arm
-            ;;
-        i?86)
-            target_name=x86
-            ;;
-        mipsel)
-            target_name=mips
-            ;;
-        esac
+    case "$target_cpu" in
+    arm)
+        target_name=arm
+        ;;
+    i?86)
+        target_name=x86
+        ;;
+    mipsel)
+        target_name=mips
+        ;;
+    esac
 
-        android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_name"
+    android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_name"
 
-        if test -d "$android_platform" ; then
-            AC_MSG_RESULT([$android_platform])
-        else
-            AC_MSG_ERROR([not found. You have to specify --with-android-platform=/path/to/ndk/platform.])
-        fi
-        NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-platform=$android_platform"
+    if test -d "$android_platform" ; then
+        AC_MSG_RESULT([$android_platform])
+    else
+        AC_MSG_ERROR([not found. Please check your NDK. With the current configuration, it should be in $android_platform])
     fi
 
     dnl Old NDK support. If minimum requirement is changed to NDK r8b,
     dnl please remove this.
     case "$target_cpu" in
     i?86)
         if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then
             dnl Old NDK toolchain name
--- a/js/src/build/autoconf/android.m4
+++ b/js/src/build/autoconf/android.m4
@@ -33,21 +33,16 @@ MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
                           android platform version, default] MIN_ANDROID_VERSION,
     android_version=$withval)
 
 if test $android_version -lt MIN_ANDROID_VERSION ; then
     AC_MSG_ERROR([--with-android-version must be at least MIN_ANDROID_VERSION.])
 fi
 
-MOZ_ARG_WITH_STRING(android-platform,
-[  --with-android-platform=DIR
-                           location of platform dir],
-    android_platform=$withval)
-
 case "$target" in
 arm-linux*-android*|*-linuxandroid*)
     android_tool_prefix="arm-linux-androideabi"
     ;;
 i?86-*android*)
     android_tool_prefix="i686-linux-android"
     ;;
 mipsel-*android*)
@@ -111,39 +106,36 @@ case "$target" in
         else
             AC_MSG_RESULT([$android_toolchain])
         fi
         NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain"
     fi
 
     NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-version=$android_version"
 
-    if test -z "$android_platform" ; then
-        AC_MSG_CHECKING([for android platform directory])
+    AC_MSG_CHECKING([for android platform directory])
 
-        case "$target_cpu" in
-        arm)
-            target_name=arm
-            ;;
-        i?86)
-            target_name=x86
-            ;;
-        mipsel)
-            target_name=mips
-            ;;
-        esac
+    case "$target_cpu" in
+    arm)
+        target_name=arm
+        ;;
+    i?86)
+        target_name=x86
+        ;;
+    mipsel)
+        target_name=mips
+        ;;
+    esac
 
-        android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_name"
+    android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_name"
 
-        if test -d "$android_platform" ; then
-            AC_MSG_RESULT([$android_platform])
-        else
-            AC_MSG_ERROR([not found. You have to specify --with-android-platform=/path/to/ndk/platform.])
-        fi
-        NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-platform=$android_platform"
+    if test -d "$android_platform" ; then
+        AC_MSG_RESULT([$android_platform])
+    else
+        AC_MSG_ERROR([not found. Please check your NDK. With the current configuration, it should be in $android_platform])
     fi
 
     dnl Old NDK support. If minimum requirement is changed to NDK r8b,
     dnl please remove this.
     case "$target_cpu" in
     i?86)
         if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then
             dnl Old NDK toolchain name