From: kenstir <kenstir@gmail.com>
Date: Sat, 21 Nov 2015 19:17:51 +0000 (-0500)
Subject: eg_app now builds with proguard, making APK nearly 30% smaller
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ff8afb8faeebb06cd26e4048d62959f644759cd2;p=working%2FEvergreen.git

eg_app now builds with proguard, making APK nearly 30% smaller
---

diff --git a/Open-ILS/src/Android/.gitignore b/Open-ILS/src/Android/.gitignore
index 03a5d3328a..4bf775e8cf 100644
--- a/Open-ILS/src/Android/.gitignore
+++ b/Open-ILS/src/Android/.gitignore
@@ -7,5 +7,6 @@ bin/
 gen/
 kc/
 out/
+proguard_logs/
 local.properties
 proguard-project.txt
diff --git a/Open-ILS/src/Android/core/core.iml b/Open-ILS/src/Android/core/core.iml
index 7c7437b0c2..5c2fda5eb9 100644
--- a/Open-ILS/src/Android/core/core.iml
+++ b/Open-ILS/src/Android/core/core.iml
@@ -12,10 +12,12 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/src/org/open_ils/test" />
     </content>
     <content url="file://$MODULE_DIR$/../opensrf">
       <sourceFolder url="file://$MODULE_DIR$/../opensrf/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/test" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/Open-ILS/src/Android/eg_app/.idea/compiler.xml b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
index 48555b6ad4..c006a22fa1 100644
--- a/Open-ILS/src/Android/eg_app/.idea/compiler.xml
+++ b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
@@ -4,7 +4,20 @@
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
       <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/Cache.java" />
-      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/test/TestCache.java" />
+      <directory url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/net/xmpp" includeSubdirectories="true" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Stack.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Session.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Sys.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/Request.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/ClientSession.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/MultiSession.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/ServerSession.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/SettingsClient.java" />
+      <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/test/TestLogin.java" />
+      <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/util/Utils.java" />
+      <file url="file://$PROJECT_DIR$/../core/src/org/open_ils/Sys.java" />
+      <directory url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/test" includeSubdirectories="true" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/XMLFlattener.java" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
diff --git a/Open-ILS/src/Android/opensrf/libs/java_memcached-release_2.0.1.jar b/Open-ILS/src/Android/opensrf/libs/java_memcached-release_2.0.1.jar
deleted file mode 100644
index 9f62013fe4..0000000000
Binary files a/Open-ILS/src/Android/opensrf/libs/java_memcached-release_2.0.1.jar and /dev/null differ
diff --git a/Open-ILS/src/Android/opensrf/libs/json-20090211.jar b/Open-ILS/src/Android/opensrf/libs/json-20090211.jar
deleted file mode 100644
index ef29094093..0000000000
Binary files a/Open-ILS/src/Android/opensrf/libs/json-20090211.jar and /dev/null differ