Commit: 81b6eb51c5938d522958e6062ac4d1ab136a6179 - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 81b6eb51c5938d522958e6062ac4d1ab136a6179 (tree)
• Zeit: 2012-09-12 16:38:23
• Autor: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

proguard を通すと起動しなくなっていたのを修正

Ändern Zusammenfassung

• modified: notepad-app-level-11/pom.xml
• delete: notepad-app-level-11/proguard.conf => notepad-app/proguard.cfg
• modified: notepad-app/pom.xml

Diff

--- a/notepad-app-level-11/pom.xml
+++ b/notepad-app-level-11/pom.xml
@@ -65,7 +65,6 @@
 					</sdk>
 					<proguard>
 						<skip>true</skip>
-						<config>proguard.conf</config>
 					</proguard>
 					<extractDuplicates>true</extractDuplicates>
 				</configuration>
@@ -192,7 +191,7 @@
 							</sign>
 							<proguard>
 								<skip>false</skip>
-								<config>proguard.conf</config>
+								<config>proguard.cfg</config>
 							</proguard>
 						</configuration>
 					</plugin>

--- a/notepad-app/pom.xml
+++ b/notepad-app/pom.xml
@@ -65,7 +65,6 @@
 					</sdk>
 					<proguard>
 						<skip>true</skip>
-						<config>proguard.conf</config>
 					</proguard>
 					<extractDuplicates>true</extractDuplicates>
 				</configuration>
@@ -192,11 +191,6 @@
 							<proguard>
 								<skip>false</skip>
 								<config>proguard.cfg</config>
-								<!--
-								<config>proguard.cfg</config>
-								<config>proguard-android.txt</config>
-								<config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
-								-->
 							</proguard>
 						</configuration>
 					</plugin>

--- a/notepad-app-level-11/proguard.conf
+++ b/notepad-app/proguard.cfg
@@ -1,11 +1,29 @@
 # Configuration for ProGuard
 # From http://proguard.sourceforge.net/index.html#/manual/examples.html#androidapplication
 
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
 -dontpreverify
--repackageclasses ''
--optimizations !code/simplification/arithmetic
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize and preverify steps (and performs some
+# of these optimizations on its own).
+## optimize : off
+#-dontoptimize
+## optimize : on
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+##
+
 -keepattributes *Annotation*
 
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public interface com.android.vending.licensing.ILicensingService
+
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
@@ -35,8 +53,6 @@
     public static <fields>;
 }
 
--keep public interface com.android.vending.licensing.ILicensingService
-
 -keepclasseswithmembernames class * {
     native <methods>;
 }
@@ -46,7 +62,7 @@
     public static ** valueOf(java.lang.String);
 }
 
-# Removes all calls to Log. Delete the methods you want to keep.
+# Removes all calls to Log. Delete the methods if you want to keep.
 -assumenosideeffects class android.util.Log {
     public static int v(...);
     public static int d(...);
@@ -56,7 +72,7 @@
     public static int wtf(...);
 }
 
--assumenosideeffects class org.routine_work.android_r.utils.Log{
+-assumenosideeffects class org.routine_work.utils.Log{
     public static int v(...);
     public static int d(...);
     public static int i(...);