From 4108ecd29f4d0b3b4a58fc373206f2cfe429df34 Mon Sep 17 00:00:00 2001
From: Vahagn Khachatryan <vahagn.khachatryan@gmail.com>
Date: Mon, 29 Dec 2014 19:00:18 +0400
Subject: [PATCH] proguard-project.txt is renamed ot proguard-rules.pro

---
 app/build.gradle                                 | 13 +++++++++----
 app/{proguard-project.txt => proguard-rules.pro} |  9 +++------
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename app/{proguard-project.txt => proguard-rules.pro} (62%)

diff --git a/app/build.gradle b/app/build.gradle
index 1aee708..610c2fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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
         }
 
diff --git a/app/proguard-project.txt b/app/proguard-rules.pro
similarity index 62%
rename from app/proguard-project.txt
rename to app/proguard-rules.pro
index f2fe155..d169105 100644
--- a/app/proguard-project.txt
+++ b/app/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in C:\Program Files (x86)\Android\android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html