Include dmg2img executable in build

This commit is contained in:
Davide Depau 2018-08-16 13:39:37 +02:00
parent d59bfb46aa
commit 9b12ebf8b1
Signed by: depau
GPG key ID: C7D999B6A55EFE86
9 changed files with 57 additions and 1 deletions

9
.gitmodules vendored
View file

@ -1,3 +1,12 @@
[submodule "libaums"] [submodule "libaums"]
path = libaums path = libaums
url = https://github.com/Depau/libaums.git url = https://github.com/Depau/libaums.git
[submodule "dmg2img"]
path = dmg2img/src/c/dmg2img
url = https://github.com/Depau/dmg2img-cmake.git
[submodule "app/src/c/bzip2"]
path = dmg2img/src/c/bzip2
url = https://github.com/LuaDist/bzip2.git
[submodule "app/src/c/libressl"]
path = dmg2img/src/c/libressl
url = https://github.com/libressl-portable/portable.git

View file

@ -32,6 +32,7 @@ dependencies {
implementation 'com.android.support:recyclerview-v7:28.0.0-rc01' implementation 'com.android.support:recyclerview-v7:28.0.0-rc01'
// implementation 'com.github.mjdev:libaums:0.5.5' // implementation 'com.github.mjdev:libaums:0.5.5'
implementation project(':libaums') implementation project(':libaums')
implementation project(':dmg2img')
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

18
dmg2img/CMakeLists.txt Normal file
View file

@ -0,0 +1,18 @@
cmake_minimum_required(VERSION 3.4)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/main/assets/bin/${ANDROID_ABI}")
execute_process(
COMMAND truncate -s 0 crypto/compat/getpagesize.c
WORKING_DIRECTORY src/c/libressl)
execute_process(
COMMAND ./autogen.sh
WORKING_DIRECTORY src/c/libressl)
include_directories(src/c/bzip2)
include_directories(src/c/libressl/include)
add_subdirectory(src/c/bzip2)
add_subdirectory(src/c/libressl)
add_subdirectory(src/c/dmg2img)

22
dmg2img/build.gradle Normal file
View file

@ -0,0 +1,22 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
defaultConfig {
externalNativeBuild {
cmake {
targets "crypto", "bz2", "ssl", "tls", "dmg2img"
}
}
}
externalNativeBuild {
cmake {
path "CMakeLists.txt"
}
}
sourceSets {
main {
assets.srcDirs = ['src/main/assets']
}
}
}

1
dmg2img/src/c/bzip2 Submodule

@ -0,0 +1 @@
Subproject commit 55ff70772d3bbe5e911d4ce970368cb630461c63

1
dmg2img/src/c/dmg2img Submodule

@ -0,0 +1 @@
Subproject commit 1d7529285a7bdeb4f1eb158d9305494d682e323d

@ -0,0 +1 @@
Subproject commit 4dbf285573d5254e5169be44e45c7685a336b6e8

View file

@ -0,0 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eu.vu1tur.dmg2img" >
</manifest>

View file

@ -1,2 +1,2 @@
include ':app', ':libaums' include ':app', ':libaums', ':dmg2img'
project(':libaums').projectDir = new File('libaums/libaums') project(':libaums').projectDir = new File('libaums/libaums')