From 43bf89c6e43016dbf251382347ada9d964f767dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 24 Mar 2020 14:13:43 +0100
Subject: [PATCH] [ion] Android build: specify libepsilon libraries' name when
 building the apk

---
 ion/src/simulator/android/Makefile                   | 12 ++++++------
 ion/src/simulator/android/build.gradle               |  3 +++
 .../com/numworks/calculator/EpsilonActivity.java     |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ion/src/simulator/android/Makefile b/ion/src/simulator/android/Makefile
index 2c3af707c..8e1527ec0 100644
--- a/ion/src/simulator/android/Makefile
+++ b/ion/src/simulator/android/Makefile
@@ -60,15 +60,15 @@ epsilon_apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mip
 
 define rule_for_gradle
 .PHONY: gradle_$1_$2
-gradle_$1_$2: $$(epsilon_apk_deps) $$(patsubst %,$$(BUILD_DIR)/app/libs/%/libepsilon$2so,$(NDK_ABIS))
+gradle_$1_$2.: $$(epsilon_apk_deps) $$(patsubst %,$$(BUILD_DIR)/app/libs/%/libepsilon$2.so,$(NDK_ABIS))
 	@echo "GRADLE ion/src/simulator/android/build.gradle"
-	$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle $1
+	$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) LIBEPSILON_NAME="epsilon$2" ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle $1
 endef
 
-$(eval $(call rule_for_gradle,assembleCodesigned,.))
-$(eval $(call rule_for_gradle,assembleRelease,.))
-$(eval $(call rule_for_gradle,assembleCodesigned,.official.))
-$(eval $(call rule_for_gradle,assembleRelease,.official.))
+$(eval $(call rule_for_gradle,assembleCodesigned,))
+$(eval $(call rule_for_gradle,assembleRelease,))
+$(eval $(call rule_for_gradle,assembleCodesigned,.official))
+$(eval $(call rule_for_gradle,assembleRelease,.official))
 
 DEFAULT = epsilon.apk
 
diff --git a/ion/src/simulator/android/build.gradle b/ion/src/simulator/android/build.gradle
index 158615d97..e7e1d5c14 100644
--- a/ion/src/simulator/android/build.gradle
+++ b/ion/src/simulator/android/build.gradle
@@ -58,6 +58,9 @@ android {
       initWith buildTypes.release
       signingConfig signingConfigs.environment
     }
+    buildTypes.each {
+      it.buildConfigField "String", "LIBEPSILON_NAME", "\"${System.getenv('LIBEPSILON_NAME')}\""
+    }
   }
   sourceSets{
     main {
diff --git a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java b/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
index 6a1c4f159..00c4d4aac 100644
--- a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
+++ b/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
@@ -20,7 +20,7 @@ public class EpsilonActivity extends SDLActivity {
 
   protected String[] getLibraries() {
     return new String[] {
-      "epsilon"
+      BuildConfig.LIBEPSILON_NAME
     };
   }