new NDK using clang

Author: tomas-mraz

vulkandraw/vulkandraw_android/Makefile

@@ -1,22 +1,15 @@
-ANDROID_TOOLCHAIN_DIR ?= $(shell pwd)/toolchain
-ANDROID_API ?= 21
-ANDROID_SYSROOT = $(NDK)/platforms/android-$(ANDROID_API)/arch-arm
+OS=linux
+ANDROID_API ?= 23
+ANDROID_TOOLCHAIN_DIR ?= $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(OS)-x86_64/bin
 
-all: toolchain build apk
-
-toolchain:
-	$(NDK)/build/tools/make_standalone_toolchain.py \
-		--api=$(ANDROID_API) --install-dir=$(ANDROID_TOOLCHAIN_DIR) \
-		--arch=arm --stl libc++
+all: build apk
 
 build:
 	mkdir -p android/jni/lib
-	CC="$(ANDROID_TOOLCHAIN_DIR)/bin/arm-linux-androideabi-gcc" \
-	CXX="$(ANDROID_TOOLCHAIN_DIR)/bin/arm-linux-androideabi-g++" \
-	CGO_CFLAGS="-march=armv7-a" \
+	CC="$(ANDROID_TOOLCHAIN_DIR)/aarch64-linux-android$(ANDROID_API)-clang" \
+	CXX="$(ANDROID_TOOLCHAIN_DIR)/aarch64-linux-android$(ANDROID_API)-clang++" \
 	GOOS=android \
-	GOARCH=arm \
-	GOARM=7 \
+	GOARCH=arm64 \
 	CGO_ENABLED=1 \
 	go build -buildmode=c-shared -o android/jni/lib/libvulkandraw.so
 

vulkandraw/vulkandraw_android/android/AndroidManifest.xml

@@ -3,7 +3,7 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="21" />
+    <uses-sdk android:minSdkVersion="23" />
 
     <application android:label="VulkanDraw" android:hasCode="false">
         <activity android:name="android.app.NativeActivity"

vulkandraw/vulkandraw_android/android/Makefile

@@ -1,15 +1,17 @@
 all: project build 
 
 build:
-	ndk-build
 	ant debug
 
 install:
-	ndk-build
 	ant debug install
 
 project:
-	# (required) go get github.com/xlab/android-go/cmd/android-project
+    # command "android-project" require installation:
+    # go get github.com/xlab/treeprint
+    # go get github.com/jawher/mow.cli
+    # go install github.com/xlab/android-go/cmd/android-project
+
 	android-project update --target android-23 --name VulkanDraw --path .
 
 project-n:

vulkandraw/vulkandraw_android/android/jni/Application.mk

@@ -1,2 +1,2 @@
-APP_PLATFORM := android-21
-APP_ABI := armeabi armeabi-v7a
+APP_PLATFORM := android-23
+APP_ABI := arm64-v8a

vulkandraw/vulkandraw_android/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/vulkan-go/demos/vulkandraw"
+	"vulkandraw"
 	vk "github.com/vulkan-go/vulkan"
 	"github.com/xlab/android-go/android"
 	"github.com/xlab/android-go/app"