Skip to content

Commit

Permalink
Fix:build:Keep generated Android resource files in build dir
Browse files Browse the repository at this point in the history
Signed-off-by: mvglasow <michael -at- vonglasow.com>
  • Loading branch information
mvglasow authored and jkoan committed Feb 21, 2021
1 parent d98dfad commit e90aa03
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
20 changes: 9 additions & 11 deletions scripts/build_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ 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

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
Expand All @@ -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
Expand Down

0 comments on commit e90aa03

Please sign in to comment.