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 external dependencies

Browse Source
This commit is contained in:
topjohnwu 2024-07-16 08:58:37 -07:00
parent e6067b539f
commit 3a4348c605
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -8,7 +8,7 @@ Clone the following repos:
```
git clone https://git.busybox.net/busybox/
git clone https://github.com/topjohnwu/selinux jni/selinux
git clone https://android.googlesource.com/platform/external/selinux jni/selinux
git clone https://android.googlesource.com/platform/external/pcre jni/pcre
```
@ -22,4 +22,4 @@ Currently, the script supports BusyBox version `1.36.1`, please checkout to the
## Credits
Most files in `patches` are copied/modified from [osm0sis/android-busybox-ndk](https://github.com/osm0sis/android-busybox-ndk). Theses patches are required for a fully functioning BusyBox building with NDK + Bionic libc.
Some files in `patches` are modified from [osm0sis/android-busybox-ndk](https://github.com/osm0sis/android-busybox-ndk).

16
jni/external.mk
View File

@ -1,13 +1,10 @@
LOCAL_PATH := $(call my-dir)
SE_PATH := $(LOCAL_PATH)/selinux
# libselinux.a
include $(CLEAR_VARS)
LIBSELINUX := $(SE_PATH)/libselinux/include
LOCAL_MODULE:= libselinux
LOCAL_C_INCLUDES := $(LIBSELINUX)
LOCAL_EXPORT_C_INCLUDES := $(LIBSELINUX)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/selinux/libselinux/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := libpcre2
LOCAL_CFLAGS := \
-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unused-function \
@ -76,13 +73,13 @@ include $(BUILD_STATIC_LIBRARY)
# libpcre2.a
include $(CLEAR_VARS)
LIBPCRE2 := $(LOCAL_PATH)/pcre/include
LOCAL_MODULE:= libpcre2
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=8
LOCAL_C_INCLUDES := $(LIBPCRE2) $(LIBPCRE2)_internal
LOCAL_EXPORT_C_INCLUDES := $(LIBPCRE2)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/pcre/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_SRC_FILES := \
pcre/src/pcre2_auto_possess.c \
pcre/src/pcre2_chkdint.c \
pcre/src/pcre2_compile.c \
pcre/src/pcre2_config.c \
pcre/src/pcre2_context.c \
@ -91,11 +88,10 @@ LOCAL_SRC_FILES := \
pcre/src/pcre2_error.c \
pcre/src/pcre2_extuni.c \
pcre/src/pcre2_find_bracket.c \
pcre/src/pcre2_fuzzsupport.c \
pcre/src/pcre2_jit_compile.c \
pcre/src/pcre2_maketables.c \
pcre/src/pcre2_match.c \
pcre/src/pcre2_match_data.c \
pcre/src/pcre2_jit_compile.c \
pcre/src/pcre2_newline.c \
pcre/src/pcre2_ord2utf.c \
pcre/src/pcre2_pattern_info.c \