From 5ad5a3fd38c822312fbd79096f4673ba3966dbd9 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sun, 22 Jan 2017 13:43:24 +0100 Subject: [PATCH] Further automatizations --- project/jni/python3/Android.mk | 8 +++----- project/jni/python3/compile.sh | 8 ++++++-- project/jni/python3/python3-android | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/project/jni/python3/Android.mk b/project/jni/python3/Android.mk index 97fec8139..4cb5b93f8 100644 --- a/project/jni/python3/Android.mk +++ b/project/jni/python3/Android.mk @@ -1,8 +1,6 @@ LOCAL_PATH := $(call my-dir) - - include $(CLEAR_VARS) ifeq ($(TARGET_ARCH),arm) @@ -17,7 +15,7 @@ LOCAL_SHARED_LIBRARIES := LOCAL_LDLIBS := -LOCAL_SRC_FILES = libpython3.5m.so +LOCAL_SRC_FILES = lib/libpython3.5m.so include $(PREBUILT_SHARED_LIBRARY) @@ -34,9 +32,9 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := python3.5m -LOCAL_LDLIBS := +LOCAL_LDLIBS := -LOCAL_SRC_FILES = libpython3.so +LOCAL_SRC_FILES = lib/libpython3.so include $(PREBUILT_SHARED_LIBRARY) diff --git a/project/jni/python3/compile.sh b/project/jni/python3/compile.sh index eb4691bce..64637f352 100755 --- a/project/jni/python3/compile.sh +++ b/project/jni/python3/compile.sh @@ -2,7 +2,8 @@ #ARCH_LIST="arm64-v8a x86 mips armeabi-v7a armeabi" -ARCH_LIST="arm x86 mips" +#ARCH_LIST="arm x86 mips" +ARCH_LIST="arm" mkdir -p build @@ -25,5 +26,8 @@ for PID in $PIDS; do done # Provide includes for the to be built apps -#rm -rf include +rm include +rm lib +ln -s python3-android/build/13b-23-arm-linux-androideabi-4.9/include include +ln -s python3-android/build/13b-23-arm-linux-androideabi-4.9/lib lib #cp -r -L build/armeabi-v7a/include ./ || exit 1 diff --git a/project/jni/python3/python3-android b/project/jni/python3/python3-android index 6cd444f9a..a81e23364 160000 --- a/project/jni/python3/python3-android +++ b/project/jni/python3/python3-android @@ -1 +1 @@ -Subproject commit 6cd444f9afb8d8701057a93b20ae729351e15cf9 +Subproject commit a81e23364609045b1b7e0087d55a985cbdaecb23