From ea179e14dcfd9fd52af749e60f2511ec6d981e32 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 20 May 2022 17:45:13 +0200
Subject: [PATCH] JNI-177 Stop using NDK Standalone toolchains.

---
 android/external/Makefile.conf                |  2 ++
 android/external/arm64-v8a/Makefile           | 18 +++++-----------
 .../generate-standalone-ndk-toolchain.sh      | 21 -------------------
 android/external/armeabi-v7a/Makefile         | 17 ++++++---------
 .../generate-standalone-ndk-toolchain.sh      | 21 -------------------
 android/external/downloads/Makefile           | 17 ++-------------
 android/external/x86/Makefile                 | 18 +++++-----------
 .../x86/generate-standalone-ndk-toolchain.sh  | 21 -------------------
 android/external/x86_64/Makefile              | 14 +++----------
 .../generate-standalone-ndk-toolchain.sh      | 21 -------------------
 10 files changed, 23 insertions(+), 147 deletions(-)
 delete mode 100755 android/external/arm64-v8a/generate-standalone-ndk-toolchain.sh
 delete mode 100755 android/external/armeabi-v7a/generate-standalone-ndk-toolchain.sh
 delete mode 100755 android/external/x86/generate-standalone-ndk-toolchain.sh
 delete mode 100755 android/external/x86_64/generate-standalone-ndk-toolchain.sh

diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf
index 232f3a4..37ff815 100644
--- a/android/external/Makefile.conf
+++ b/android/external/Makefile.conf
@@ -9,8 +9,10 @@ NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
 
 ifeq ($(NDK_UNAME),darwin)
     SED=gsed
+    TOOLCHAIN_ARCH=darwin-x86_64
 else
     SED=sed
+    TOOLCHAIN_ARCH=linux-x86_64
 endif
 
 ### Sequoia deps versions
diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile
index b690c74..4c72753 100644
--- a/android/external/arm64-v8a/Makefile
+++ b/android/external/arm64-v8a/Makefile
@@ -18,14 +18,7 @@ ANDROID_API ?= 21
 
 all: build
 
-build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpan-build
-
-#------------------------------------------------------------------------------#
-# Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
-
-ndk-standalone-toolchain/bin/clang:
-	bash generate-standalone-ndk-toolchain.sh
+build: showsetup uuid-install sequoia-ffi-install libetpan-build
 
 #------------------------------------------------------------------------------#
 # Manage paths for PREFIX, DESTDIR, LOCAL and PATH
@@ -48,14 +41,13 @@ NDK_TOOLCHAIN = $(HOST)-$(NDK_TOOLCHAIN_COMPILER)
 TARGET_ARCH_ABI = $(APP_ABI)
 include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
-ANDROID_NDK_HOME=$(EXTERNAL_ROOT)/ndk-standalone-toolchain
+ANDROID_NDK_HOME=$(ANDROID_NDK)/toolchains/llvm/prebuilt/$(TOOLCHAIN_ARCH)
 
 LD := $(ANDROID_NDK_HOME)/bin/$(HOST)-ld
 AR := $(ANDROID_NDK_HOME)/bin/$(HOST)-ar
-AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang++
+AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-as
+CC := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang
+CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang++
 RANLIB := $(ANDROID_NDK_HOME)/bin/$(HOST)-ranlib
 STRIP := $(ANDROID_NDK_HOME)/bin/$(HOST)-strip
 
diff --git a/android/external/arm64-v8a/generate-standalone-ndk-toolchain.sh b/android/external/arm64-v8a/generate-standalone-ndk-toolchain.sh
deleted file mode 100755
index 5a4196f..0000000
--- a/android/external/arm64-v8a/generate-standalone-ndk-toolchain.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-usage="Usage: $(basename "$0") [-h][--force] -- Script to generate android standalone toolchain to build pEp for Android.
-
-where:
-    -h  Show this help text
-    --force  Force generating the toolchain"
-
-
-if [ "$1" == "-h" ]; then
-echo "$usage"
-    exit 0
-fi
-
-if [ -z "$ANDROID_NDK" ]; then
-    echo "Please define \$ANDROID_NDK"
-    exit 1
-fi
-
-$ANDROID_NDK/build/tools/make_standalone_toolchain.py $1 --arch arm64 --api 21 --install-dir=ndk-standalone-toolchain
-exit 0
-
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index b03e22d..b5681e7 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -19,14 +19,8 @@ ANDROID_API ?= 18
 all: build
 #assets
 
-build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpan-build
+build: showsetup uuid-install sequoia-ffi-install libetpan-build
 
-#------------------------------------------------------------------------------#
-# Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
-
-ndk-standalone-toolchain/bin/clang:
-	bash generate-standalone-ndk-toolchain.sh
 
 #------------------------------------------------------------------------------#
 # Manage paths for PREFIX, DESTDIR, LOCAL and PATH
@@ -43,19 +37,20 @@ PATH := ${PATH}:$(NDK_TOOLCHAIN)/bin:$(LOCAL)/bin
 NDK_SYSROOT=$(ANDROID_NDK_HOME)/sysroot
 
 HOST = arm-linux-androideabi
+HOST_V7 = armv7a-linux-androideabi
 NDK_TOOLCHAIN = $(HOST)-$(NDK_TOOLCHAIN_COMPILER)
 
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
 include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
-ANDROID_NDK_HOME=$(EXTERNAL_ROOT)/ndk-standalone-toolchain
+ANDROID_NDK_HOME=$(ANDROID_NDK)/toolchains/llvm/prebuilt/$(TOOLCHAIN_ARCH)
 
 LD := $(ANDROID_NDK_HOME)/bin/$(HOST)-ld
 AR := $(ANDROID_NDK_HOME)/bin/$(HOST)-ar
-AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang++
+AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-as
+CC := $(ANDROID_NDK_HOME)/bin/$(HOST_V7)$(ANDROID_API)-clang
+CXX := $(ANDROID_NDK_HOME)/bin/$(HOST_V7)$(ANDROID_API)-clang++
 RANLIB := $(ANDROID_NDK_HOME)/bin/$(HOST)-ranlib
 STRIP := $(ANDROID_NDK_HOME)/bin/$(HOST)-strip
 
diff --git a/android/external/armeabi-v7a/generate-standalone-ndk-toolchain.sh b/android/external/armeabi-v7a/generate-standalone-ndk-toolchain.sh
deleted file mode 100755
index d6b5604..0000000
--- a/android/external/armeabi-v7a/generate-standalone-ndk-toolchain.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-usage="Usage: $(basename "$0") [-h][--force] -- Script to generate android standalone toolchain to build pEp for Android.
-
-where:
-    -h  Show this help text
-    --force  Force generating the toolchain"
-
-
-if [ "$1" == "-h" ]; then
-echo "$usage"
-    exit 0
-fi
-
-if [ -z "$ANDROID_NDK" ]; then
-    echo "Please define \$ANDROID_NDK"
-    exit 1
-fi
-
-$ANDROID_NDK/build/tools/make_standalone_toolchain.py $1 --arch arm --api 18 --install-dir=ndk-standalone-toolchain
-exit 0
-
diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile
index 38218b0..bc8bdd1 100644
--- a/android/external/downloads/Makefile
+++ b/android/external/downloads/Makefile
@@ -15,22 +15,9 @@ include ../Makefile.conf
 
 all: downloads.stamp
 
-downloads.stamp: download-iconv download-uuid download-sequoia-deps download-etpan download-sequoia \
-	generate-ndk-arm generate-ndk-arm64 generate-ndk-x86 generate-ndk-x86_64
+downloads.stamp: download-iconv download-uuid download-sequoia-deps download-etpan download-sequoia
 	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
-
-generate-ndk-x86:
-	cd ../x86 && bash generate-standalone-ndk-toolchain.sh
-
-generate-ndk-x86_64:
-	cd ../x86_64 && bash generate-standalone-ndk-toolchain.sh
-
 download-iconv: libiconv-1.15.tar.gz
 
 download-uuid: ossp-uuid_1.6.2.orig.tar.gz
@@ -118,4 +105,4 @@ clean:
 
 .PHONY: all clean download-iconv \
 		download-uuid download-etpan \
-		download-sequoia-deps download-sequoia
\ No newline at end of file
+		download-sequoia-deps download-sequoia
diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile
index 5376ef6..ea2e0ab 100644
--- a/android/external/x86/Makefile
+++ b/android/external/x86/Makefile
@@ -18,14 +18,7 @@ ANDROID_API ?= 18
 
 all: build
 
-build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpan-build
-
-#------------------------------------------------------------------------------#
-# Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
-
-ndk-standalone-toolchain/bin/clang:
-	bash generate-standalone-ndk-toolchain.sh
+build: showsetup uuid-install sequoia-ffi-install libetpan-build
 
 #------------------------------------------------------------------------------#
 # Manage paths for PREFIX, DESTDIR, LOCAL and PATH
@@ -48,14 +41,13 @@ NDK_TOOLCHAIN = $(APP_ABI)-$(NDK_TOOLCHAIN_COMPILER)
 TARGET_ARCH_ABI = $(APP_ABI)
 include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
-ANDROID_NDK_HOME=$(EXTERNAL_ROOT)/ndk-standalone-toolchain
+ANDROID_NDK_HOME=$(ANDROID_NDK)/toolchains/llvm/prebuilt/$(TOOLCHAIN_ARCH)
 
 LD := $(ANDROID_NDK_HOME)/bin/$(HOST)-ld
 AR := $(ANDROID_NDK_HOME)/bin/$(HOST)-ar
-AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang
-CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)-clang++
+AS := $(ANDROID_NDK_HOME)/bin/$(HOST)-as
+CC := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang
+CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang++
 RANLIB := $(ANDROID_NDK_HOME)/bin/$(HOST)-ranlib
 STRIP := $(ANDROID_NDK_HOME)/bin/$(HOST)-strip
 
diff --git a/android/external/x86/generate-standalone-ndk-toolchain.sh b/android/external/x86/generate-standalone-ndk-toolchain.sh
deleted file mode 100755
index 1bc6783..0000000
--- a/android/external/x86/generate-standalone-ndk-toolchain.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-usage="Usage: $(basename "$0") [-h][--force] -- Script to generate android standalone toolchain to build pEp for Android.
-
-where:
-    -h  Show this help text
-    --force  Force generating the toolchain"
-
-
-if [ "$1" == "-h" ]; then
-echo "$usage"
-    exit 0
-fi
-
-if [ -z "$ANDROID_NDK" ]; then
-    echo "Please define \$ANDROID_NDK"
-    exit 1
-fi
-
-$ANDROID_NDK/build/tools/make_standalone_toolchain.py $1 --arch x86 --api 18 --install-dir=ndk-standalone-toolchain
-exit 0
-
diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile
index 2e7649a..0d2b33e 100644
--- a/android/external/x86_64/Makefile
+++ b/android/external/x86_64/Makefile
@@ -18,14 +18,7 @@ ANDROID_API ?= 21
 
 all: build
 
-build: generate-ndk-toolchain showsetup uuid-install sequoia-ffi-install libetpan-build
-
-#------------------------------------------------------------------------------#
-# Generate standalone toolchain
-generate-ndk-toolchain: ndk-standalone-toolchain/bin/clang
-
-ndk-standalone-toolchain/bin/clang:
-	bash generate-standalone-ndk-toolchain.sh
+build:showsetup uuid-install sequoia-ffi-install libetpan-build
 
 #------------------------------------------------------------------------------#
 # Manage paths for PREFIX, DESTDIR, LOCAL and PATH
@@ -48,12 +41,11 @@ NDK_TOOLCHAIN = $(APP_ABI)-$(NDK_TOOLCHAIN_COMPILER)
 TARGET_ARCH_ABI = $(APP_ABI)
 include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
-ANDROID_NDK_HOME=$(EXTERNAL_ROOT)/ndk-standalone-toolchain
+ANDROID_NDK_HOME=$(ANDROID_NDK)/toolchains/llvm/prebuilt/$(TOOLCHAIN_ARCH)
 
 LD := $(ANDROID_NDK_HOME)/bin/$(HOST)-ld
 AR := $(ANDROID_NDK_HOME)/bin/$(HOST)-ar
-AS := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang
-CC := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang
+AS := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-as
 CC := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang
 CXX := $(ANDROID_NDK_HOME)/bin/$(HOST)$(ANDROID_API)-clang++
 RANLIB := $(ANDROID_NDK_HOME)/bin/$(HOST)-ranlib
diff --git a/android/external/x86_64/generate-standalone-ndk-toolchain.sh b/android/external/x86_64/generate-standalone-ndk-toolchain.sh
deleted file mode 100755
index 0a6c857..0000000
--- a/android/external/x86_64/generate-standalone-ndk-toolchain.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-usage="Usage: $(basename "$0") [-h][--force] -- Script to generate android standalone toolchain to build pEp for Android.
-
-where:
-    -h  Show this help text
-    --force  Force generating the toolchain"
-
-
-if [ "$1" == "-h" ]; then
-echo "$usage"
-    exit 0
-fi
-
-if [ -z "$ANDROID_NDK" ]; then
-    echo "Please define \$ANDROID_NDK"
-    exit 1
-fi
-
-$ANDROID_NDK/build/tools/make_standalone_toolchain.py $1 --arch x86_64 --api 21 --install-dir=ndk-standalone-toolchain
-exit 0
-