aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-06-02 08:08:21 +0200
committerBananeweizen <bananeweizen@gmx.de>2013-06-02 08:08:21 +0200
commit61e89db0863410d692a136fce09e1a9376eca51a (patch)
tree85c12dcf7997bf801f5dc17b93860f86d8d3bc9f
parentfa7174789f57d5a804af6c2ff632749137bcaddc (diff)
downloadcgeo-61e89db0863410d692a136fce09e1a9376eca51a.zip
cgeo-61e89db0863410d692a136fce09e1a9376eca51a.tar.gz
cgeo-61e89db0863410d692a136fce09e1a9376eca51a.tar.bz2
refactoring: reuse default proguard settings
* see http://tools.android.com/recent/proguardimprovements
-rw-r--r--main/ant.properties2
-rw-r--r--main/proguard-project.txt (renamed from main/proguard.cfg)0
-rw-r--r--main/project.properties5
3 files changed, 4 insertions, 3 deletions
diff --git a/main/ant.properties b/main/ant.properties
index e3fa250..e92e080 100644
--- a/main/ant.properties
+++ b/main/ant.properties
@@ -15,7 +15,5 @@
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.
-proguard.config=proguard.cfg
-proguard.jar=support/proguard.jar
source.dir=src;thirdparty
java.compilerargs=-Xlint \ No newline at end of file
diff --git a/main/proguard.cfg b/main/proguard-project.txt
index 762d381..762d381 100644
--- a/main/proguard.cfg
+++ b/main/proguard-project.txt
diff --git a/main/project.properties b/main/project.properties
index a475ee2..894c810 100644
--- a/main/project.properties
+++ b/main/project.properties
@@ -3,9 +3,12 @@
#
# This file must be checked in Version Control Systems.
#
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=Google Inc.:Google APIs:17