Android: Fixed androidbuild.sh not working on OS X (thanks, Steffen!).
authorPhilipp Wiesemann
Mon, 18 Jul 2016 22:01:01 +0200
changeset 10200c678dcec4f44
parent 10199 6ab154366a9b
child 10201 4b0ac1c3fcf8
Android: Fixed androidbuild.sh not working on OS X (thanks, Steffen!).

Fixes Bugzilla #2429.
build-scripts/androidbuild.sh
     1.1 --- a/build-scripts/androidbuild.sh	Sun Jul 17 21:43:12 2016 +0200
     1.2 +++ b/build-scripts/androidbuild.sh	Mon Jul 18 22:01:01 2016 +0200
     1.3 @@ -87,8 +87,8 @@
     1.4  fi
     1.5  
     1.6  cp -r $SDLPATH/Android.mk $BUILDPATH/jni/SDL
     1.7 -sed -i "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk
     1.8 -sed -i "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml
     1.9 +sed -i -e "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk
    1.10 +sed -i -e "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml
    1.11  
    1.12  # Copy user sources
    1.13  for src in "${SOURCES[@]}"
    1.14 @@ -105,8 +105,8 @@
    1.15  done
    1.16  
    1.17  ACTIVITY="${folder}Activity"
    1.18 -sed -i "s|SDLActivity|$ACTIVITY|g" $BUILDPATH/AndroidManifest.xml
    1.19 -sed -i "s|SDLActivity|$APP|g" $BUILDPATH/build.xml
    1.20 +sed -i -e "s|SDLActivity|$ACTIVITY|g" $BUILDPATH/AndroidManifest.xml
    1.21 +sed -i -e "s|SDLActivity|$APP|g" $BUILDPATH/build.xml
    1.22  
    1.23  # Fill in a default Activity
    1.24  echo "package $APP;" >  "$ACTIVITY.java"