summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2021-02-20 16:14:45 +0200
committerjkoan <jkoan@users.noreply.github.com>2021-02-21 11:38:50 +0100
commite90aa031b50b6d3031537b30fd9c559d43c516cf (patch)
tree1293b6e1e06f743d2926b2fca5a5c09a2d8096d4 /scripts
parentd98dfad72ce0d591921f1040d6e2519cdcf42673 (diff)
downloadnavit-e90aa031b50b6d3031537b30fd9c559d43c516cf.tar.gz
Fix:build:Keep generated Android resource files in build dir
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_android.sh20
1 files changed, 9 insertions, 11 deletions
diff --git a/scripts/build_android.sh b/scripts/build_android.sh
index e4065531e..57bf42c50 100755
--- a/scripts/build_android.sh
+++ b/scripts/build_android.sh
@@ -38,10 +38,10 @@ cmake ../ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64
echo Process icons
pushd navit/icons
make || exit 32
-rm -rf ../../../navit/android/res/drawable-nodpi
-mkdir ../../../navit/android/res/drawable-nodpi
-cp ./*.png ../../../navit/android/res/drawable-nodpi
-pushd ../../../navit/android/res/drawable-nodpi
+rm -rf ../../android/res/drawable-nodpi
+mkdir -p ../../android/res/drawable-nodpi
+cp ./*.png ../../android/res/drawable-nodpi
+pushd ../../android/res/drawable-nodpi
rename -f 'y/A-Z/a-z/' ./*.png
popd
popd
@@ -49,10 +49,10 @@ popd
echo Process translations
pushd po
make || exit 64
-rm -rf ../../navit/android/res/raw
-mkdir ../../navit/android/res/raw
-cp ./*.mo ../../navit/android/res/raw
-pushd ../../navit/android/res/raw
+rm -rf ../android/res/raw
+mkdir -p ../android/res/raw
+cp ./*.mo ../android/res/raw
+pushd ../android/res/raw
rename -f 'y/A-Z/a-z/' ./*.mo
popd
popd
@@ -61,11 +61,9 @@ popd
echo Process xml config files
make navit_config_xml || exit 96
-pushd ../navit
rm -rf ./android/assets
mkdir -p ./android/assets
-cp -R ../$BUILD_PATH/navit/config ./android/assets/
-popd
+cp -R ./navit/config ./android/assets/
#run gradle from root dir, not $BUILD_PATH
popd