Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

makefile: added support for arm64-v8a #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

makefile: added support for arm64-v8a #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions src/android/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,126 @@
LOCAL_PATH := $(call my-dir)
JXCORE_OUT_ANDROID := ../jxcore-binaries/

$(info $$TARGET_ARCH is [${TARGET_ARCH}])

include $(CLEAR_VARS)
LOCAL_MODULE := cares
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libcares_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libcares_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libcares_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := chrome_zlib
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libchrome_zlib_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libchrome_zlib_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libchrome_zlib_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := http_parser
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libhttp_parser_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libhttp_parser_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libhttp_parser_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := openssl
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libopenssl_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libopenssl_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libopenssl_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := sqlite3
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsqlite3_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsqlite3_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsqlite3_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libuv
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libuv_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libuv_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libuv_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libmozjs
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libmozjs_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libmozjs_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libmozjs_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := jxcore_native
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libjx_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libjx_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libjx_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := liblevel
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldb_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldb_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldb_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libsnappy
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsnappy_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsnappy_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libsnappy_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libdown
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldown_ia32.a
else
else ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldown_arm.a
else
LOCAL_SRC_FILES := $(JXCORE_OUT_ANDROID)libleveldown_arm64.a
endif
include $(PREBUILT_STATIC_LIBRARY)

Expand Down
2 changes: 1 addition & 1 deletion src/android/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -std=gnu++11
APP_ABI := armeabi armeabi-v7a x86
APP_ABI := armeabi armeabi-v7a x86 arm64-v8a
APP_PLATFORM := android-9