...
 
Commits (3)
......@@ -277,6 +277,7 @@ if(ANDROID)
set(KF5WindowSystem_DIR ${KF5_LIBRARIES}/cmake/KF5WindowSystem)
set(KF5ItemModels_DIR ${KF5_LIBRARIES}/cmake/KF5ItemModels)
set(KF5CoreAddons_DIR ${KF5_LIBRARIES}/cmake/KF5CoreAddons)
set(KF5Archive_DIR ${KF5_LIBRARIES}/cmake/KF5Archive)
endif()
......@@ -616,7 +617,8 @@ if (ANDROID)
${KF5_LIBRARIES}/libKF5I18n.so
${KF5_LIBRARIES}/libKF5CoreAddons.so
${KF5_LIBRARIES}/libKF5ConfigGui.so
${KF5_LIBRARIES}/libKF5ConfigCore.so)
${KF5_LIBRARIES}/libKF5ConfigCore.so
${KF5_LIBRARIES}/libKF5Archive.so)
endif()
find_package(PNG REQUIRED)
......
......@@ -22,6 +22,7 @@ dependencies {
ext {
abi = System.getenv('ANDROID_ABI')
installPrefix = System.getenv('INSTALL_PREFIX')
}
task ("configure") {
......@@ -30,7 +31,6 @@ task ("configure") {
logger.error('ANDROID_ABI not specified using the default one instead: armeabi-7a')
}
def installPrefix = System.getenv('INSTALL_PREFIX')
if (installPrefix == null) {
throw new GradleException('Please set INSTALL_PREFIX to the location where binaries are installed')
}
......@@ -45,13 +45,13 @@ task ("configure") {
// copy libs(plugins) which start with krita*.so and rename
// them to start with `lib_`
task copyLibs(type: Copy) {
from "${System.getenv('INSTALL_PREFIX')}/lib"
from "$installPrefix/lib"
into "libs/${abi ?: 'armeabi-v7a'}"
rename ('^krita(.*).so$', 'lib_krita$1.so')
}
task copyAssets(type: Copy) {
from "${System.getenv('INSTALL_PREFIX')}/share/"
from "$installPrefix/share/"
into 'assets/'
include '**'
}
......@@ -101,10 +101,6 @@ android {
minSdkVersion 21
}
dexOptions {
javaMaxHeapSize "4g"
}
preBuild.dependsOn(copyLibs)
preBuild.dependsOn(copyAssets)
}
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
......@@ -64,5 +64,6 @@ rm -rf kde/build/* # clean build folders
frameworks-android \
kwidgetsaddons kcompletion \
kguiaddons kitemmodels \
kitemviews kwindowsystem
kitemviews kwindowsystem \
karchive