RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Moved obb outputs definition to properties.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-11-16 13:05:03 +03:00
parent 85bb232656
commit 150102b59c
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
android/build.gradle
View file

@ -333,20 +333,18 @@ task cppClean(type: Delete) << {
}
// Tasks for generating obb files for Google Play
def unalignedFonts = "${propObbFontsOutput}.unaligned"
def unalignedWorlds = "${propObbWorldsOutput}.unaligned"
task obbClean(type: Delete) << {
delete fileTree(dir: 'build', include: '**/*.obb')
delete propObbFontsOutput, propObbWorldsOutput, unalignedFonts, unalignedWorlds
}
def rawFonts = 'build/fonts_unaligned.obb'
def rawWorlds = 'build/worlds_unaligned.obb'
def alignedFonts = 'build/worlds.obb'
def alignedWorlds = 'build/fonts.obb'
task obbGenerate() {
createObbGenerateTask('Main', propObbFonts.split(' '), rawFonts)
createObbGenerateTask('Patch', propObbWorlds.split(' '), rawWorlds)
createObbAlignTask('Main', rawFonts, alignedWorlds)
createObbAlignTask('Patch', rawWorlds, alignedFonts)
createObbGenerateTask('Main', propObbFonts.split(' '), unalignedFonts)
createObbGenerateTask('Patch', propObbWorlds.split(' '), unalignedWorlds)
createObbAlignTask('Main', unalignedFonts, propObbFontsOutput)
createObbAlignTask('Patch', unalignedWorlds, propObbWorldsOutput)
}
obbGenerate.dependsOn obbClean, obbMainGenerate, obbPatchGenerate, obbMainAlign, obbPatchAlign
@ -373,9 +371,9 @@ task obbPush(dependsOn: ['obbGenerate', 'obbPushMain', 'obbPushPatch']) {
commandLine android.getAdbExe(), 'shell', 'rm', "${obbPath}*.obb"
}
tasks.create(type: Exec, name: 'obbPushMain', dependsOn: 'obbRemoveOnDevice') {
commandLine android.getAdbExe(), 'push', alignedFonts, "${obbPath}fonts.obb"
commandLine android.getAdbExe(), 'push', propObbWorldsOutput, "${obbPath}fonts.obb"
}
tasks.create(type: Exec, name: 'obbPushPatch', dependsOn: 'obbRemoveOnDevice') {
commandLine android.getAdbExe(), 'push', alignedWorlds, "${obbPath}worlds.obb"
commandLine android.getAdbExe(), 'push', propObbFontsOutput, "${obbPath}worlds.obb"
}
}

10
android/gradle.properties
View file

@ -9,6 +9,12 @@ propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
# list of files for obb-s
propObbFonts ../data/01_dejavusans.ttf ../data/02_droidsans-fallback.ttf ../data/03_jomolhari-id-a3d.ttf \
../data/04_padauk.ttf ../data/05_khmeros.ttf ../data/06_code2000.ttf
propObbFonts ../data/01_dejavusans.ttf \
../data/02_droidsans-fallback.ttf \
../data/03_jomolhari-id-a3d.ttf \
../data/04_padauk.ttf \
../data/05_khmeros.ttf \
../data/06_code2000.ttf
propObbWorlds ../data/World.mwm ../data/WorldCoasts.mwm
propObbWorldsOutput build/worlds.obb
propObbFontsOutput build/fonts.obb