proguard-project.txt is renamed ot proguard-rules.pro

This commit is contained in:
2014-12-29 19:00:18 +04:00
parent a0f411c6ad
commit 4108ecd29f
2 changed files with 12 additions and 10 deletions

View File

@@ -36,13 +36,18 @@ preBuild.dependsOn createVersionXML
// Convert SVG images from art directory into PNG files.
//
task generateDrawablesFromArt {
doLast {
def indir = "app/src/main/art"
def outdir = "../res"
String backslash= System.getProperty("file.separator")
def buildDir = (new File(project.buildDir,'art')).toString()
buildDir = buildDir.replace(backslash,"/")
println 'make -C app/src/main/art RES=../res TMP='+buildDir
def p = ('make -C app/src/main/art RES=../res TMP='+buildDir).execute()
p.consumeProcessOutput()
def cmd = "make -C ${indir} RES=${outdir} TMP=${buildDir}"
println cmd
def p = cmd.execute()
p.consumeProcessOutput(System.err,System.err)
p.waitFor()
if ( p.exitValue() )
throw new GradleException("Generation of art failed.")
@@ -63,7 +68,7 @@ android {
buildTypes {
release {
runProguard true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.sokoban_release
}