audiostream: ensure java platform is copied into the final java path

tito · tito · commit 668cedc7b07c · 2013-01-08T17:44:38.000+01:00
diff --git a/distribute.sh b/distribute.sh
@@ -23,6 +23,7 @@ ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import
 RECIPES_PATH="$ROOT_PATH/recipes"
 BUILD_PATH="$ROOT_PATH/build"
 LIBS_PATH="$ROOT_PATH/build/libs"
+JAVACLASS_PATH="$ROOT_PATH/build/java"
 PACKAGES_PATH="$ROOT_PATH/.packages"
 SRC_PATH="$ROOT_PATH/src"
 JNI_PATH="$SRC_PATH/jni"
@@ -298,6 +299,7 @@ function run_prepare() {
 	test -d $PACKAGES_PATH || mkdir -p $PACKAGES_PATH
 	test -d $BUILD_PATH || mkdir -p $BUILD_PATH
 	test -d $LIBS_PATH || mkdir -p $LIBS_PATH
+	test -d $JAVACLASS_PATH || mkdir -p $JAVACLASS_PATH
 	test -d $LIBLINK_PATH || mkdir -p $LIBLINK_PATH
 
 	# create initial files
@@ -545,6 +547,9 @@ function run_distribute() {
 	try mkdir -p libs/$ARCH
 	try cp -a $BUILD_PATH/libs/* libs/$ARCH/
 
+	debug "Copy java files from various libs"
+	try cp -a $BUILD_PATH/java/* src
+
 	debug "Fill private directory"
 	try cp -a python-install/lib private/
 	try mkdir -p private/include/python2.7
diff --git a/recipes/audiostream/recipe.sh b/recipes/audiostream/recipe.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# Recent change made audiostream not compatible with python-for-android yet.
-# Only h264+aac build are working.
 
 VERSION_audiostream=
 URL_audiostream=https://github.com/kivy/audiostream/zipball/master/audiostream.zip
@@ -17,7 +15,8 @@ function build_audiostream() {
 	cd $BUILD_audiostream
 
 	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/audiostream" ]; then
-		return
+		#return
+		true
 	fi
 
 	push_arm
@@ -28,9 +27,11 @@ function build_audiostream() {
 	export LDFLAGS="$LDFLAGS -lm -L$LIBS_PATH"
 	export AUDIOSTREAM_ROOT="$BUILD_audiostream/build/audiostream/armeabi-v7a"
 	try cd $BUILD_audiostream
+	$BUILD_PATH/python-install/bin/python.host setup.py build_ext &>/dev/null
 	try find . -iname '*.pyx' -exec cython {} \;
 	try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -v
 	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
+	try cp -a audiostream/platform/android/org $JAVACLASS_PATH
 
 	pop_arm
 }
