Update to BusyBox 1.34.1

This commit is contained in:
topjohnwu 2021-11-22 19:46:52 -08:00
parent 632971af15
commit 95fb230b8c
4 changed files with 35 additions and 31 deletions

View File

@ -326,38 +326,38 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LIBPCRE2 := $(LOCAL_PATH)/pcre/include LIBPCRE2 := $(LOCAL_PATH)/pcre/include
LOCAL_MODULE:= libpcre2 LOCAL_MODULE:= libpcre2
LOCAL_CFLAGS := -DHAVE_CONFIG_H LOCAL_CFLAGS := -DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=8
LOCAL_C_INCLUDES := $(LIBPCRE2) $(LIBPCRE2)_internal LOCAL_C_INCLUDES := $(LIBPCRE2) $(LIBPCRE2)_internal
LOCAL_EXPORT_C_INCLUDES := $(LIBPCRE2) LOCAL_EXPORT_C_INCLUDES := $(LIBPCRE2)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
pcre/dist2/src/pcre2_auto_possess.c \ pcre/src/pcre2_auto_possess.c \
pcre/dist2/src/pcre2_chartables.c \ pcre/src/pcre2_compile.c \
pcre/dist2/src/pcre2_compile.c \ pcre/src/pcre2_config.c \
pcre/dist2/src/pcre2_config.c \ pcre/src/pcre2_context.c \
pcre/dist2/src/pcre2_context.c \ pcre/src/pcre2_convert.c \
pcre/dist2/src/pcre2_convert.c \ pcre/src/pcre2_dfa_match.c \
pcre/dist2/src/pcre2_dfa_match.c \ pcre/src/pcre2_error.c \
pcre/dist2/src/pcre2_error.c \ pcre/src/pcre2_extuni.c \
pcre/dist2/src/pcre2_extuni.c \ pcre/src/pcre2_find_bracket.c \
pcre/dist2/src/pcre2_find_bracket.c \ pcre/src/pcre2_fuzzsupport.c \
pcre/dist2/src/pcre2_fuzzsupport.c \ pcre/src/pcre2_maketables.c \
pcre/dist2/src/pcre2_jit_compile.c \ pcre/src/pcre2_match.c \
pcre/dist2/src/pcre2_maketables.c \ pcre/src/pcre2_match_data.c \
pcre/dist2/src/pcre2_match.c \ pcre/src/pcre2_jit_compile.c \
pcre/dist2/src/pcre2_match_data.c \ pcre/src/pcre2_newline.c \
pcre/dist2/src/pcre2_newline.c \ pcre/src/pcre2_ord2utf.c \
pcre/dist2/src/pcre2_ord2utf.c \ pcre/src/pcre2_pattern_info.c \
pcre/dist2/src/pcre2_pattern_info.c \ pcre/src/pcre2_script_run.c \
pcre/dist2/src/pcre2_script_run.c \ pcre/src/pcre2_serialize.c \
pcre/dist2/src/pcre2_serialize.c \ pcre/src/pcre2_string_utils.c \
pcre/dist2/src/pcre2_string_utils.c \ pcre/src/pcre2_study.c \
pcre/dist2/src/pcre2_study.c \ pcre/src/pcre2_substitute.c \
pcre/dist2/src/pcre2_substitute.c \ pcre/src/pcre2_substring.c \
pcre/dist2/src/pcre2_substring.c \ pcre/src/pcre2_tables.c \
pcre/dist2/src/pcre2_tables.c \ pcre/src/pcre2_ucd.c \
pcre/dist2/src/pcre2_ucd.c \ pcre/src/pcre2_valid_utf.c \
pcre/dist2/src/pcre2_valid_utf.c \ pcre/src/pcre2_xclass.c \
pcre/dist2/src/pcre2_xclass.c pcre2_workaround.c
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# libxhook.a # libxhook.a

@ -1 +1 @@
Subproject commit 41288302eda410e0834aebdec4d83be4ab9e4435 Subproject commit 78f06dcf1ea2a52de3d08f913333720abd59c58b

@ -1 +1 @@
Subproject commit 465fb3954c063a938aafdec7ed9a15b3cd196086 Subproject commit 8e12681a1a252fd581830b2f65d1e154a2030bb9

View File

@ -0,0 +1,4 @@
// Workaround pcre2_chartables.c symlink to pcre2_chartables.c.dist failing on Windows NDK if Cygwin git used,
// and NDK not directly accepting a .c.dist file in LOCAL_SRC_FILES list.
#include "pcre/src/pcre2_chartables.c.dist"