diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2016-12-28 23:22:34 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-12-28 22:40:18 -0800 |
| commit | ca1349241b9f21c07f4a56399f68073cb764518f (patch) | |
| tree | 940ee935ef255d539a3144c92cb87f230db209b9 /packaging/android | |
| parent | 38474f2d47a8d43f417abf5f3341205b0888e87a (diff) | |
| download | subsurface-ca1349241b9f21c07f4a56399f68073cb764518f.tar.gz | |
android: Copy android files to the expected name
android-mobile nowadays hardcoded in CMakeLists.txt, so workaround it
here.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
| -rw-r--r-- | packaging/android/build.sh | 7 |
1 files 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 |