diff options
author | mvglasow <michael -at- vonglasow.com> | 2021-02-20 16:14:45 +0200 |
---|---|---|
committer | mvglasow <michael -at- vonglasow.com> | 2021-02-20 16:27:06 +0200 |
commit | 8b5a35da78fc24098189c85c4ef3dd0399e78423 (patch) | |
tree | 1293b6e1e06f743d2926b2fca5a5c09a2d8096d4 | |
parent | a195c285a7b14c4242b072f2331a078d25183ff1 (diff) | |
download | navit-android-builddir.tar.gz |
Fix:build:Keep generated Android resource files in build dirandroid-builddir
Signed-off-by: mvglasow <michael -at- vonglasow.com>
-rw-r--r-- | build.gradle | 4 | ||||
-rwxr-xr-x | scripts/build_android.sh | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index dfbc5962c..40fc0ebdd 100644 --- a/build.gradle +++ b/build.gradle @@ -82,8 +82,8 @@ android { java.srcDirs = ["navit/android/src"] resources.srcDirs = ["navit/android/src"] renderscript.srcDirs = ["navit/android/src"] - res.srcDirs = ["navit/android/res"] - assets.srcDirs = ["navit/android/assets"] + res.srcDirs = ["navit/android/res", "android-builddir/android/res"] + assets.srcDirs = ["navit/android/assets", "android-builddir/android/assets"] } } externalNativeBuild { 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 |