Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 673817 - Improve auto-discovering of Android platform directory. r=blassey

Browse Source 
Note that this will be fully functionnal when a new NSPR snapshot will be
pushed to the tree.
This commit is contained in:
Mounir Lamouri 2011-08-10 14:22:43 +02:00
parent 2b9adb91f8
commit fad5d9c4e1
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.in
View File

@ -322,7 +322,20 @@ case "$target" in
fi
if test -z "$android_platform" ; then
android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu"
AC_MSG_CHECKING([for android platform directory])
android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu"
# With newer NDK, the platform path has changed.
if ! test -d "$android_platform" ; then
android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_cpu"
fi
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
fi
dnl set up compilers

15
js/src/configure.in
View File

@ -313,7 +313,20 @@ case "$target" in
fi
if test -z "$android_platform" ; then
android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu"
AC_MSG_CHECKING([for android platform directory])
android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu"
# With newer NDK, the platform path has changed.
if ! test -d "$android_platform" ; then
android_platform="$android_ndk"/platforms/android-"$android_version"/arch-"$target_cpu"
fi
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
fi
dnl set up compilers