[PATCH 3/3] android: Copy android files to the expected name

Anton Lundin glance at acc.umu.se
Wed Dec 28 14:22:34 PST 2016


android-mobile nowadays hardcoded in CMakeLists.txt, so workaround it
here.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 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 9cdc8f3..9c8188e 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
-- 
2.9.3



More information about the subsurface mailing list