diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-01-25 10:42:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 10:42:08 -0800 |
| commit | 94a3c994a7a5970be3b3bb9d290f9e1d8d437034 (patch) | |
| tree | ac6b3f3fe5c03924590d4c92702092a71792a98c | |
| parent | 9bf65125330a89c8202f7f7328a464dcb80a9904 (diff) | |
| download | navit-94a3c994a7a5970be3b3bb9d290f9e1d8d437034.tar.gz | |
Android patches from Jandegr (#202)R7256
* ndk downgrade
ndk downgrade
* ndk downgrade
* Update build_android.sh
* Update build_android_x86.sh
* Update build_android.sh
* Update build_android_x86.sh
* Update build_android_x86.sh
* Update build_android.sh
* Update NavitAppConfig.java
* Add files via upload
* Delete acra-4.3.0b2.jar
* Update NavitAppConfig.java
| -rw-r--r-- | ci/build_android.sh | 6 | ||||
| -rw-r--r-- | ci/build_android_x86.sh | 6 | ||||
| -rw-r--r-- | navit/android/libs/acra-4.3.0b2.jar | bin | 96994 -> 0 bytes | |||
| -rw-r--r-- | navit/android/libs/acra-4.8.5.jar | bin | 0 -> 154375 bytes | |||
| -rw-r--r-- | navit/android/libs/android-support-v4.jar | bin | 0 -> 1364299 bytes | |||
| -rwxr-xr-x | navit/android/src/org/navitproject/navit/NavitAppConfig.java | 8 |
6 files changed, 12 insertions, 8 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 610dbc6e2..dc858e2ca 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -5,15 +5,15 @@ export ARCH="arm" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake" -export ANDROID_NDK=~/android-ndk-r13 +export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin" export ANDROID_SDK="/usr/local/android-sdk-linux/" export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH export BUILD_PATH=$START_PATH"/android-${ARCH}" -wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip -[ -d ~/android-ndk-r13 ] || unzip -q -d ~ android-ndk-r13-linux-x86_64.zip +wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip +[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH cd $BUILD_PATH diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index b42d03d9f..c5a421cbe 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -5,15 +5,15 @@ export arch="x86" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" -export ANDROID_NDK=~/android-ndk-r13 +export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin" export ANDROID_SDK="/usr/local/android-sdk-linux/" export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH export BUILD_PATH=$START_PATH"/android-${ARCH}" -wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip -[ -d ~/android-ndk-r13 ] || unzip -q -d ~ android-ndk-r13-linux-x86_64.zip +wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip +[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH cd $BUILD_PATH diff --git a/navit/android/libs/acra-4.3.0b2.jar b/navit/android/libs/acra-4.3.0b2.jar Binary files differdeleted file mode 100644 index 259a69581..000000000 --- a/navit/android/libs/acra-4.3.0b2.jar +++ /dev/null diff --git a/navit/android/libs/acra-4.8.5.jar b/navit/android/libs/acra-4.8.5.jar Binary files differnew file mode 100644 index 000000000..f0044ece8 --- /dev/null +++ b/navit/android/libs/acra-4.8.5.jar diff --git a/navit/android/libs/android-support-v4.jar b/navit/android/libs/android-support-v4.jar Binary files differnew file mode 100644 index 000000000..aa0b1a5cc --- /dev/null +++ b/navit/android/libs/android-support-v4.jar diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java index 32f003f18..13ccc9bb4 100755 --- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java +++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java @@ -8,10 +8,14 @@ import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress; import android.app.Application;
import android.content.SharedPreferences;
import android.util.Log;
-
+import org.acra.*;
import org.acra.annotation.*;
-@ReportsCrashes(formKey = "dGlrNVRIOVVKYjB0UGVoLUZPanlzWFE6MQ")
+//@ReportsCrashes(formKey = "dGlrNVRIOVVKYjB0UGVoLUZPanlzWFE6MQ")
+@ReportsCrashes(mailTo = "android@navit-project.org",
+ mode = ReportingInteractionMode.TOAST,
+ resToastText = R.string.app_name)
+
public class NavitAppConfig extends Application {
private static final int MAX_LAST_ADDRESSES = 10;
|