From ca1349241b9f21c07f4a56399f68073cb764518f Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Wed, 28 Dec 2016 23:22:34 +0100 Subject: android: Copy android files to the expected name android-mobile nowadays hardcoded in CMakeLists.txt, so workaround it here. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 9cdc8f3c0..9c8188ed9 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -351,9 +351,10 @@ if [ ! -z "$SUBSURFACE_MOBILE" ] ; then else SUBSURFACE_VERSION=$(grep CANONICAL_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \") - rm -rf android - cp -a $SUBSURFACE_SOURCE/android . - sed -i -e "s/@SUBSURFACE_VERSION@/\"$SUBSURFACE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android/AndroidManifest.xml + # android-mobile is hardcoded in CMakeLists.txt nowadays. + rm -rf android-mobile + cp -a $SUBSURFACE_SOURCE/android android-mobile + sed -i -e "s/@SUBSURFACE_VERSION@/\"$SUBSURFACE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml fi # now make the translations -- cgit v1.2.3-70-g09d2