Skip to content
This repository has been archived by the owner on Oct 3, 2024. It is now read-only.

Commit

Permalink
Put the following modules in separate projects: xDL, LZMA, BSD-System…
Browse files Browse the repository at this point in the history
…-Data-Structure. Use the git module in xCrash to introduce them.
  • Loading branch information
caikelun committed Nov 15, 2020
1 parent 46daea6 commit e3bd0ea
Show file tree
Hide file tree
Showing 103 changed files with 91 additions and 28,421 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "external/xdl"]
path = external/xdl
url = https://github.com/hexhacking/xDL.git
[submodule "external/lzma"]
path = external/lzma
url = https://github.com/hexhacking/lzma.git
[submodule "external/bsdsysds"]
path = external/bsdsysds
url = https://github.com/hexhacking/bsdsysds.git
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'digital.wup:android-maven-publish:3.6.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}
Expand Down
1 change: 1 addition & 0 deletions external/bsdsysds
Submodule bsdsysds added at cc436e
1 change: 1 addition & 0 deletions external/lzma
Submodule lzma added at 6ea060
1 change: 1 addition & 0 deletions external/xdl
Submodule xdl added at d39447
44 changes: 27 additions & 17 deletions xcrash_lib/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,31 @@ add_compile_options(
-Weverything
-Werror)

#######################################
# external
#######################################

set(BSDSYSDS_PATH ../../../../external/bsdsysds)
set(LZMA_PATH ../../../../external/lzma/C)
set(XDL_PATH ../../../../external/xdl/xdl_lib/src/main/cpp)

#######################################
# libxcrash.so
#######################################

file(GLOB XCRASH_SRC
xcrash/*.c
common/*.c
dl/*.c)
${XDL_PATH}/*.c)

add_library(xcrash SHARED
${XCRASH_SRC})

target_include_directories(xcrash PUBLIC
xcrash
common
dl)
${BSDSYSDS_PATH}
${XDL_PATH})

target_link_libraries(xcrash
log
Expand Down Expand Up @@ -67,20 +76,20 @@ file(GLOB XCRASH_DUMPER_SRC
common/*.c)

set(LZME_SRC
lzma/7zCrc.c
lzma/7zCrcOpt.c
lzma/CpuArch.c
lzma/Bra.c
lzma/Bra86.c
lzma/BraIA64.c
lzma/Delta.c
lzma/Lzma2Dec.c
lzma/LzmaDec.c
lzma/Sha256.c
lzma/Xz.c
lzma/XzCrc64.c
lzma/XzCrc64Opt.c
lzma/XzDec.c)
${LZMA_PATH}/7zCrc.c
${LZMA_PATH}/7zCrcOpt.c
${LZMA_PATH}/CpuArch.c
${LZMA_PATH}/Bra.c
${LZMA_PATH}/Bra86.c
${LZMA_PATH}/BraIA64.c
${LZMA_PATH}/Delta.c
${LZMA_PATH}/Lzma2Dec.c
${LZMA_PATH}/LzmaDec.c
${LZMA_PATH}/Sha256.c
${LZMA_PATH}/Xz.c
${LZMA_PATH}/XzCrc64.c
${LZMA_PATH}/XzCrc64Opt.c
${LZMA_PATH}/XzDec.c)

set_source_files_properties(${LZME_SRC} PROPERTIES
COMPILE_FLAGS " \
Expand All @@ -106,7 +115,8 @@ add_executable(xcrash_dumper
target_include_directories(xcrash_dumper PUBLIC
xcrash_dumper
common
lzma)
${BSDSYSDS_PATH}
${LZMA_PATH})

target_link_libraries(xcrash_dumper
log
Expand Down
Loading

0 comments on commit e3bd0ea

Please sign in to comment.