From 7210d4ae63cbe82fed4e5e1e60c5749f4c6c4b3e Mon Sep 17 00:00:00 2001
From: Hussein Kasem <devnull@localhost>
Date: Mon, 11 Nov 2019 18:53:28 +0100
Subject: [PATCH] JNI-81 Make can build arm and arm64 concurrently

---
 .hgignore                                     |   2 +
 android/external/Makefile                     |   6 +-
 android/external/arm64-v8a/Makefile           |   6 +-
 android/external/armeabi-v7a/Makefile         |   6 +-
 android/external/downloads/Makefile           |  17 ++-
 ...-pEpJNIAdapter-android-pEpJNIAdapter~2.iml | 120 ------------------
 6 files changed, 26 insertions(+), 131 deletions(-)
 delete mode 100644 android/src-pEpJNIAdapter-android-pEpJNIAdapter~2.iml

diff --git a/.hgignore b/.hgignore
index fbfd9cb..2d31c0b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -78,6 +78,8 @@ androidTests/gradlew.bat
 src/org.tar.gz
 src/local.conf
 
+*.iml
+
 syntax: regexp
 android/external/[^.]*
 
diff --git a/android/external/Makefile b/android/external/Makefile
index cbede80..c99ac77 100644
--- a/android/external/Makefile
+++ b/android/external/Makefile
@@ -21,10 +21,12 @@ endif
 
 .PHONY: all build clean clean-all
 
-all: build
+all: build-arm build-arm64
 
-build: downloads/downloads.stamp
+build-arm: downloads/downloads.stamp
 	$(MAKE) -C armeabi-v7a
+
+build-arm64: downloads/downloads.stamp
 	$(MAKE) -C arm64-v8a
 
 clean:
diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile
index 8d72d9a..4ae2960 100644
--- a/android/external/arm64-v8a/Makefile
+++ b/android/external/arm64-v8a/Makefile
@@ -22,9 +22,9 @@ build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpa
 
 #------------------------------------------------------------------------------#
 # Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/AndroidVersion.txt
+generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
 
-ndk-standalone-toolchain/AndroidVersion.txt:
+ndk-standalone-toolchain/bin/clang:
 	bash generate-standalone-ndk-toolchain.sh
 
 #------------------------------------------------------------------------------#
@@ -307,7 +307,7 @@ nettle-install: $(LOCAL)/lib/libnettle.so
 #------------------------------------------------------------------------------#
 # Sequoia-ffi
 
-CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/build/$(APP_ABI)
+CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
 
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index 36fd236..db0ad25 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -23,9 +23,9 @@ build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpa
 
 #------------------------------------------------------------------------------#
 # Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/AndroidVersion.txt
+generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
 
-ndk-standalone-toolchain/AndroidVersion.txt:
+ndk-standalone-toolchain/bin/clang:
 	bash generate-standalone-ndk-toolchain.sh
 
 #------------------------------------------------------------------------------#
@@ -309,7 +309,7 @@ nettle-install: $(LOCAL)/lib/libnettle.so
 
 #------------------------------------------------------------------------------#
 # Sequoia-ffi
-CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/$(APP_ABI)
+CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build
 
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile
index 91e3e3c..ff8af1e 100644
--- a/android/external/downloads/Makefile
+++ b/android/external/downloads/Makefile
@@ -13,16 +13,24 @@ include ../Makefile.conf
 #------------------------------------------------------------------------------#
 # Build parameters
 
-all:  download-iconv download-uuid download-sequoia-deps download-etpan download-sequoia downloads.stamp
+all: downloads.stamp
 
-downloads.stamp:
+downloads.stamp: download-iconv download-uuid download-sequoia-deps download-etpan download-sequoia \
+	generate-ndk-arm generate-ndk-arm64
 	touch $@
 
+generate-ndk-arm64:
+	cd ../arm64-v8a && bash generate-standalone-ndk-toolchain.sh
+
+generate-ndk-arm:
+	cd ../armeabi-v7a && bash generate-standalone-ndk-toolchain.sh
+
 download-iconv: libiconv-1.15.tar.gz
 
 download-uuid: ossp-uuid_1.6.2.orig.tar.gz
 
-download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 nettle-$(NETTLE_VERSION).tar.gz
+download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 \
+						nettle-$(NETTLE_VERSION).tar.gz
 
 download-etpan: libetpan.git.stamp
 
@@ -91,11 +99,14 @@ git_clones: $(EXTERNAL_LOCAL_GITS)
 
 git_update: $(EXTERNAL_LOCAL_GITS_UPDATE)
 
+#------------------------------------------------------------------------------#
 clean:
 	rm -rf *.git
 	rm -rf *.stamp
 	rm -rf *.tar.gz
 	rm -rf *.tar.bz2
+	rm -rf ../arm64-v8a/ndk-standalone-toolchain
+	rm -rf ../armeabi-v7a/ndk-standalone-toolchain
 
 .PHONY: all clean download-iconv \
 		download-uuid download-etpan \
diff --git a/android/src-pEpJNIAdapter-android-pEpJNIAdapter~2.iml b/android/src-pEpJNIAdapter-android-pEpJNIAdapter~2.iml
deleted file mode 100644
index 8e36636..0000000
--- a/android/src-pEpJNIAdapter-android-pEpJNIAdapter~2.iml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":pEpJNIAdapter" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../pEp4Android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":pEpJNIAdapter" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.0" />
-      </configuration>
-    </facet>
-    <facet type="native-android-gradle" name="Native-Android-Gradle">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug-armeabi-v7a" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../libpEpAdapter">
-      <sourceFolder url="file://$MODULE_DIR$/../../libpEpAdapter" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../pEpEngine/asn.1">
-      <sourceFolder url="file://$MODULE_DIR$/../../pEpEngine/asn.1" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../pEpEngine/src">
-      <sourceFolder url="file://$MODULE_DIR$/../../pEpEngine/src" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/external/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/external/uuid" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <content url="file://$MODULE_DIR$/../src">
-      <sourceFolder url="file://$MODULE_DIR$/../src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android-android-27" level="project" />
-  </component>
-</module>
\ No newline at end of file