From e81f12af6f5965ee9a9041eb3ce020aaf4d296e3 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Fri, 17 Aug 2018 21:51:40 +0200 Subject: [PATCH] Make sure executables are position-independent --- dmg2img/CMakeLists.txt | 6 ++++++ dmg2img/build.gradle | 1 + 2 files changed, 7 insertions(+) diff --git a/dmg2img/CMakeLists.txt b/dmg2img/CMakeLists.txt index 34d6ef0..5128ef3 100644 --- a/dmg2img/CMakeLists.txt +++ b/dmg2img/CMakeLists.txt @@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 3.4) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/main/assets/bin/${ANDROID_ABI}") +find_program(CCACHE_FOUND ccache) +if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +endif(CCACHE_FOUND) + execute_process( COMMAND truncate -s 0 crypto/compat/getpagesize.c WORKING_DIRECTORY src/c/libressl) diff --git a/dmg2img/build.gradle b/dmg2img/build.gradle index 8ece2fd..31d88fc 100644 --- a/dmg2img/build.gradle +++ b/dmg2img/build.gradle @@ -6,6 +6,7 @@ android { externalNativeBuild { cmake { targets "crypto", "bz2", "ssl", "tls", "dmg2img" + arguments "-DANDROID_PIE=ON" } } }