topjohnwu/ndk-box-kitchen
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-box-kitchen.git synced 2024-11-23 11:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Makefiles

Browse Source
This commit is contained in:
topjohnwu 2020-05-02 00:55:36 -07:00
parent b4e67f8c70
commit 9b5606e1f8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jni/Android.mk
View File

@ -1,12 +1,6 @@
LOCAL_PATH := $(call my-dir)
CWD_PATH := $(call my-dir)
# Define include paths for external.mk
LIBSELINUX := jni/selinux/libselinux/include
LIBPCRE2 := jni/pcre/include
include $(CWD_PATH)/../busybox/Android.mk
include $(CWD_PATH)/external.mk
# Uncomment to build BusyBox
include $(LOCAL_PATH)/../external.mk
include $(LOCAL_PATH)/../busybox/Android.mk
# Uncomment to build ToyBox
# include $(LOCAL_PATH)/../toybox/Android.mk
# include $(CWD_PATH)/../toybox/Android.mk

10
external.mk → jni/external.mk
View File

@ -1,10 +1,12 @@
# Define LIBPCRE and LIBSELINUX in higher level Makefiles
LOCAL_PATH := $(call my-dir)
# libpcre2.a
include $(CLEAR_VARS)
LIBPCRE2 := $(LOCAL_PATH)/pcre/include
LOCAL_MODULE:= libpcre2
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_C_INCLUDES := $(LIBPCRE2) $(LIBPCRE2)_internal
LOCAL_EXPORT_C_INCLUDES := $(LIBPCRE2)
LOCAL_SRC_FILES := \
pcre/dist2/src/pcre2_auto_possess.c \
pcre/dist2/src/pcre2_chartables.c \
@ -36,10 +38,14 @@ LOCAL_SRC_FILES := \
pcre/dist2/src/pcre2_xclass.c
include $(BUILD_STATIC_LIBRARY)
SE_PATH := $(LOCAL_PATH)/selinux
# libselinux.a
include $(CLEAR_VARS)
LIBSELINUX := $(SE_PATH)/libselinux/include
LOCAL_MODULE:= libselinux
LOCAL_C_INCLUDES := $(LIBSELINUX) $(LIBPCRE2)
LOCAL_C_INCLUDES := $(LIBSELINUX)
LOCAL_EXPORT_C_INCLUDES := $(LIBSELINUX)
LOCAL_STATIC_LIBRARIES := libpcre2
LOCAL_CFLAGS := \
-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unused-function \