Remove topjohnwu/libcxx dependency
John Wu has stopped the development of https://github.com/topjohnwu/libcxx. LSPosed will now use llvm's static stdc++ library, see https://developer.android.com/ndk/guides/cpp-support.
This commit is contained in:
parent
2bc0f0c716
commit
7cd98e6d48
|
|
@ -7,9 +7,6 @@
|
||||||
[submodule "external/fmt"]
|
[submodule "external/fmt"]
|
||||||
path = external/fmt
|
path = external/fmt
|
||||||
url = https://github.com/fmtlib/fmt.git
|
url = https://github.com/fmtlib/fmt.git
|
||||||
[submodule "external/cxx"]
|
|
||||||
path = external/cxx
|
|
||||||
url = https://github.com/topjohnwu/libcxx.git
|
|
||||||
[submodule "patch/libs/manifest-editor"]
|
[submodule "patch/libs/manifest-editor"]
|
||||||
path = axml/libs/manifest-editor
|
path = axml/libs/manifest-editor
|
||||||
url = https://github.com/WindySha/ManifestEditor.git
|
url = https://github.com/WindySha/ManifestEditor.git
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ cmaker {
|
||||||
arrayOf(
|
arrayOf(
|
||||||
"-DEXTERNAL_ROOT=${File(rootDir.absolutePath, "external")}",
|
"-DEXTERNAL_ROOT=${File(rootDir.absolutePath, "external")}",
|
||||||
"-DCORE_ROOT=${File(rootDir.absolutePath, "core/src/main/jni")}",
|
"-DCORE_ROOT=${File(rootDir.absolutePath, "core/src/main/jni")}",
|
||||||
"-DANDROID_STL=none",
|
|
||||||
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
|
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -7,99 +7,6 @@ endmacro()
|
||||||
SET_OPTION(Plugin.SymbolResolver OFF)
|
SET_OPTION(Plugin.SymbolResolver OFF)
|
||||||
SET_OPTION(FMT_INSTALL OFF)
|
SET_OPTION(FMT_INSTALL OFF)
|
||||||
|
|
||||||
set(LIBCXX_SOURCES
|
|
||||||
algorithm.cpp
|
|
||||||
# any.cpp
|
|
||||||
atomic.cpp
|
|
||||||
barrier.cpp
|
|
||||||
# bind.cpp
|
|
||||||
charconv.cpp
|
|
||||||
chrono.cpp
|
|
||||||
condition_variable.cpp
|
|
||||||
condition_variable_destructor.cpp
|
|
||||||
# debug.cpp
|
|
||||||
exception.cpp
|
|
||||||
# filesystem/directory_iterator.cpp
|
|
||||||
# filesystem/int128_builtins.cpp
|
|
||||||
# filesystem/operations.cpp
|
|
||||||
functional.cpp
|
|
||||||
future.cpp
|
|
||||||
hash.cpp
|
|
||||||
# ios.cpp
|
|
||||||
# ios.instantiations.cpp
|
|
||||||
# iostream.cpp
|
|
||||||
# locale.cpp
|
|
||||||
memory.cpp
|
|
||||||
mutex.cpp
|
|
||||||
mutex_destructor.cpp
|
|
||||||
new.cpp
|
|
||||||
optional.cpp
|
|
||||||
random.cpp
|
|
||||||
# regex.cpp
|
|
||||||
# ryu/d2fixed.cpp
|
|
||||||
# ryu/d2s.cpp
|
|
||||||
# ryu/f2s.cpp
|
|
||||||
shared_mutex.cpp
|
|
||||||
stdexcept.cpp
|
|
||||||
string.cpp
|
|
||||||
# strstream.cpp
|
|
||||||
system_error.cpp
|
|
||||||
thread.cpp
|
|
||||||
# typeinfo.cpp
|
|
||||||
utility.cpp
|
|
||||||
valarray.cpp
|
|
||||||
variant.cpp
|
|
||||||
vector.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
list(TRANSFORM LIBCXX_SOURCES PREPEND cxx/src/)
|
|
||||||
|
|
||||||
set(LIBCXX_EXPORT_FLAGS
|
|
||||||
-DLIBCXX_BUILDING_LIBCXXABI
|
|
||||||
-D_LIBCPP_NO_EXCEPTIONS
|
|
||||||
-D_LIBCPP_NO_RTTI
|
|
||||||
-D_LIBCPP_BUILDING_LIBRARY
|
|
||||||
-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
|
|
||||||
-D_LIBCXXABI_NO_EXCEPTIONS
|
|
||||||
-D_LIBCPP_HAS_NO_LOCALIZATION
|
|
||||||
)
|
|
||||||
set(LIBCXX_FLAGS
|
|
||||||
-fvisibility-global-new-delete-hidden
|
|
||||||
-fvisibility=hidden
|
|
||||||
-fvisibility-inlines-hidden
|
|
||||||
)
|
|
||||||
set(LIBCXX_EXPORT_INCLUDES cxx/include)
|
|
||||||
set(LIBCXX_INCLUDES cxx/src)
|
|
||||||
|
|
||||||
set(LIBCXXABI_SOURCES
|
|
||||||
abort_message.cpp
|
|
||||||
cxa_aux_runtime.cpp
|
|
||||||
cxa_default_handlers.cpp
|
|
||||||
cxa_exception_storage.cpp
|
|
||||||
cxa_guard.cpp
|
|
||||||
cxa_handlers.cpp
|
|
||||||
cxa_noexception.cpp
|
|
||||||
cxa_thread_atexit.cpp
|
|
||||||
cxa_vector.cpp
|
|
||||||
cxa_virtual.cpp
|
|
||||||
stdlib_exception.cpp
|
|
||||||
stdlib_new_delete.cpp
|
|
||||||
stdlib_stdexcept.cpp
|
|
||||||
stdlib_typeinfo.cpp
|
|
||||||
)
|
|
||||||
list(TRANSFORM LIBCXXABI_SOURCES PREPEND cxx/src/abi/)
|
|
||||||
set(LIBCXXABI_FLAGS
|
|
||||||
-Wno-macro-redefined
|
|
||||||
-Wno-unknown-attributes
|
|
||||||
-DHAS_THREAD_LOCAL)
|
|
||||||
set(LIBCXXABI_INCLUDES cxx/include/abi)
|
|
||||||
|
|
||||||
add_library(cxx STATIC ${LIBCXX_SOURCES} ${LIBCXXABI_SOURCES})
|
|
||||||
target_compile_options(cxx PUBLIC ${LIBCXX_EXPORT_FLAGS})
|
|
||||||
target_compile_options(cxx PRIVATE ${LIBCXX_FLAGS} ${LIBCXXABI_FLAGS} -ffunction-sections -fdata-sections)
|
|
||||||
target_include_directories(cxx PUBLIC ${LIBCXX_EXPORT_INCLUDES})
|
|
||||||
target_include_directories(cxx PRIVATE ${LIBCXX_INCLUDES} ${LIBCXXABI_INCLUDES})
|
|
||||||
|
|
||||||
set(XZ_SOURCES
|
set(XZ_SOURCES
|
||||||
xz_crc32.c
|
xz_crc32.c
|
||||||
xz_crc64.c
|
xz_crc64.c
|
||||||
|
|
@ -112,10 +19,7 @@ add_library(xz_static STATIC ${XZ_SOURCES})
|
||||||
target_compile_options(xz_static PRIVATE -DXZ_USE_CRC64)
|
target_compile_options(xz_static PRIVATE -DXZ_USE_CRC64)
|
||||||
target_include_directories(xz_static PRIVATE ${XZ_INCLUDES})
|
target_include_directories(xz_static PRIVATE ${XZ_INCLUDES})
|
||||||
|
|
||||||
link_libraries(cxx)
|
|
||||||
|
|
||||||
OPTION(LSPLANT_BUILD_SHARED OFF)
|
OPTION(LSPLANT_BUILD_SHARED OFF)
|
||||||
OPTION(LSPLT_BUILD_SHARED OFF)
|
|
||||||
add_subdirectory(dobby)
|
add_subdirectory(dobby)
|
||||||
add_subdirectory(fmt)
|
add_subdirectory(fmt)
|
||||||
add_subdirectory(lsplant/lsplant/src/main/jni)
|
add_subdirectory(lsplant/lsplant/src/main/jni)
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 12c8f4e93f196a700137e983dcceeac43cf807f2
|
|
||||||
Loading…
Reference in New Issue