diff --git a/.gitmodules b/.gitmodules index a7239f992..66b3fa917 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,3 +68,6 @@ path = project/jni/openssl/openssl/jni url = https://android.googlesource.com/platform/external/openssl branch = lollipop-mr1-dev +[submodule "project/jni/application/xserver/pulseaudio"] + path = project/jni/application/xserver/pulseaudio + url = git@github.com:pelya/pulseaudio-android.git diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index 470f8b02c..aebafa772 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit 470f8b02ca0bd8f4f0cc24fbdf40651326fa7667 +Subproject commit aebafa77217b909d4f3c119aa73b3ee2c9b03ebf diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh index 591c33cad..fe42c67c2 100755 --- a/project/jni/application/xserver/AndroidBuild.sh +++ b/project/jni/application/xserver/AndroidBuild.sh @@ -71,6 +71,7 @@ rm -rf $CURDIR/tmp-$1 mkdir -p $CURDIR/tmp-$1 cd $CURDIR/tmp-$1 cp $CURDIR/xserver/data/busybox-$1 ./busybox +#cp $CURDIR/pulseaudio/pulseaudio-$1 ./pulseaudio cp $CURDIR/ssh ./ cp $CURDIR/sshpass ./ mkdir -p usr/bin diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio new file mode 160000 index 000000000..483ebf28f --- /dev/null +++ b/project/jni/application/xserver/pulseaudio @@ -0,0 +1 @@ +Subproject commit 483ebf28f872219a3ba29d9cbc4d38728da459b0