banvor/android_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vahagn Khachatryan
2014-12-29 19:00:18 +04:00
parent a0f411c6ad
commit 4108ecd29f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

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

9
app/proguard-project.txt → app/proguard-rules.pro vendored
View File

@@ -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. # Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified # By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt # in C:\Program Files (x86)\Android\android-sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard # You can edit the include path and order by changing the proguardFiles
# include property in project.properties. # directive in build.gradle.
# #
# For more details, see # For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html # http://developer.android.com/guide/developing/tools/proguard.html