From 17ad99c2065875edc2289001b982d8ffbf0f952c Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Thu, 23 Apr 2020 00:21:39 -0700
Subject: [PATCH] Fix Android templates size regression

The issue was caused by PR #36906 which changes prevented the generated shared libraries from being stripped.
Since the change is only needed for development (debugging) purposes, it's commented out by default.

(cherry picked from commit 2f38cfd9ab4dc0105097f8b109391af4510a2c60)
---
 platform/android/java/app/build.gradle | 4 +++-
 platform/android/java/lib/build.gradle | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index d57cb95de1f..751ee45421e 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -90,7 +90,9 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
-        doNotStrip '**/*.so'
+
+        // Should be uncommented for development purpose within Android Studio
+        // doNotStrip '**/*.so'
     }
 
     // Both signing and zip-aligning will be done at export time
diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle
index 6bb438c249a..19eee5a315b 100644
--- a/platform/android/java/lib/build.gradle
+++ b/platform/android/java/lib/build.gradle
@@ -26,7 +26,9 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
-        doNotStrip '**/*.so'
+
+        // Should be uncommented for development purpose within Android Studio
+        // doNotStrip '**/*.so'
     }
 
     sourceSets {