diff --git a/android/build.gradle b/android/build.gradle
index 4fe17d88..d58e098f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -19,7 +19,7 @@ repositories {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "org.purplei2p.i2pd"
         targetSdkVersion 25
@@ -49,7 +49,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             signingConfig signingConfigs.orignal
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
         }
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 0fa116c2..b5b920fa 100755
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -19,7 +19,8 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 APP_CPPFLAGS += -DANDROID_ARM7A
 endif
 
-APP_OPTIM  := debug
+# Forcing debug optimization. Use `ndk-build NDK_DEBUG=1` instead.
+#APP_OPTIM  := debug
 
 # git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git
 # git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt.git
diff --git a/android_binary_only/jni/Application.mk b/android_binary_only/jni/Application.mk
index 7cd5c813..b8cdc2ab 100755
--- a/android_binary_only/jni/Application.mk
+++ b/android_binary_only/jni/Application.mk
@@ -21,7 +21,8 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 APP_CPPFLAGS += -DANDROID_ARM7A
 endif
 
-APP_OPTIM  := debug
+# Forcing debug optimization. Use `ndk-build NDK_DEBUG=1` instead.
+#APP_OPTIM  := debug
 
 # git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git
 # git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt.git