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.

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

out of tree luajit #502

Merged
merged 2 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion jni/luajit/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE := luajit
ifeq (,$(and $(LUAJIT_INC),$(LUAJIT_LIB)))
LOCAL_SRC_FILES := build/$(TARGET_ARCH_ABI)/lib/libluajit.so
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/build/$(TARGET_ARCH_ABI)/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/build/$(TARGET_ARCH_ABI)/include/luajit-2.1
else
LOCAL_SRC_FILES := $(LUAJIT_LIB)
LOCAL_EXPORT_C_INCLUDES := $(LUAJIT_INC)
endif

include $(PREBUILT_SHARED_LIBRARY)
6 changes: 3 additions & 3 deletions jni/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "android_native_app_glue.h"
#include "jni_helper.h"

#include "luajit-2.1/lua.h"
#include "luajit-2.1/lualib.h"
#include "luajit-2.1/lauxlib.h"
#include "lua.h"
#include "lualib.h"
#include "lauxlib.h"

#define TAG "NativeThread"

Expand Down