diff --git a/.gitmodules b/.gitmodules index 560dad57..1d2f5725 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "external/fmt"] path = external/fmt 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"] path = axml/libs/manifest-editor url = https://github.com/WindySha/ManifestEditor.git diff --git a/build.gradle.kts b/build.gradle.kts index 346ce4bf..03aaec24 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,6 @@ cmaker { arrayOf( "-DEXTERNAL_ROOT=${File(rootDir.absolutePath, "external")}", "-DCORE_ROOT=${File(rootDir.absolutePath, "core/src/main/jni")}", - "-DANDROID_STL=none", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON", ) ) @@ -119,4 +118,4 @@ subprojects { targetCompatibility = androidTargetCompatibility } } -} \ No newline at end of file +} diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 122addff..434f9b81 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -7,99 +7,6 @@ endmacro() SET_OPTION(Plugin.SymbolResolver 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 xz_crc32.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_include_directories(xz_static PRIVATE ${XZ_INCLUDES}) -link_libraries(cxx) - OPTION(LSPLANT_BUILD_SHARED OFF) -OPTION(LSPLT_BUILD_SHARED OFF) add_subdirectory(dobby) add_subdirectory(fmt) add_subdirectory(lsplant/lsplant/src/main/jni) diff --git a/external/cxx b/external/cxx deleted file mode 160000 index 12c8f4e9..00000000 --- a/external/cxx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 12c8f4e93f196a700137e983dcceeac43cf807f2