Merge branch 'master' of github.com:kivy/python-for-android

tshirtman · tshirtman · commit f8901e9cd397 · 2012-05-31T02:32:16.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -99,7 +99,7 @@ function push_arm() {
 
 	# this must be something depending of the API level of Android
 	export PATH="$ANDROIDNDK/toolchains/arm-eabi-4.4.0/prebuilt/linux-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
-	if [ "X${ANDROIDNDKVER:0:2}" == "Xr7"  ]; then
+	if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
 		export TOOLCHAIN_PREFIX=arm-linux-androideabi
 		export TOOLCHAIN_VERSION=4.4.3
 	elif [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -10,7 +10,7 @@ Python for android is a project to create your own Python distribution
 including the modules you want, and create an apk including python, libs, and
 your application.
 
-- Forum: https://groups.google.com/forum/?hl=fr#!forum/python-android
+- Forum: https://groups.google.com/forum/#!forum/python-android
 - Mailing list: python-android@googlegroups.com
 
 .. toctree::
@@ -25,6 +25,7 @@ your application.
     recipes.rst
     android.rst
     related.rst
+    faq.rst
 
 Indices and tables
 ==================
diff --git a/recipes/sqlite3/recipe.sh b/recipes/sqlite3/recipe.sh
@@ -12,7 +12,9 @@ function prebuild_sqlite3() {
 
 function build_sqlite3() {
 	cd $SRC_PATH/jni
+	push_arm
 	try ndk-build V=1 sqlite3
+	pop_arm
 }
 
 function postbuild_sqlite3() {
