From a7cc45053eea8733ebe80fd638633a09695e7983 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Sun, 29 Apr 2012 17:50:36 -0400 Subject: [PATCH] Build 4.1b233 Signed-off-by: Ricky Barrette --- FindMyCarFull/AndroidManifest.xml | 2 +- FindMyCarFull/proguard.cfg | 50 +++++++++++++++++++++++--- FindMyCarFull/project.properties | 3 +- FindMyCarLib/.classpath | 2 +- FindMyCarLib/bin/findmycarlib.jar | Bin 77960 -> 77960 bytes FindMyCarLite/.classpath | 2 +- FindMyCarLite/AndroidManifest.xml | 2 +- FindMyCarLite/proguard.cfg | 58 ++++++++++++++++++++++++++---- FindMyCarLite/project.properties | 3 +- 9 files changed, 103 insertions(+), 19 deletions(-) diff --git a/FindMyCarFull/AndroidManifest.xml b/FindMyCarFull/AndroidManifest.xml index 2603d0b..be74431 100644 --- a/FindMyCarFull/AndroidManifest.xml +++ b/FindMyCarFull/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/FindMyCarFull/proguard.cfg b/FindMyCarFull/proguard.cfg index 71e998a..33723e3 100644 --- a/FindMyCarFull/proguard.cfg +++ b/FindMyCarFull/proguard.cfg @@ -1,25 +1,55 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html -renamesourcefileattribute SourceFile -keepattributes SourceFile,LineNumberTable --optimizationpasses 5 +-flattenpackagehierarchy -dontusemixedcaseclassnames -dontskipnonpubliclibraryclasses --dontpreverify -verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* +-repackageclasses 'com.FindMyCarFull' +# 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). +-dontoptimize +-dontpreverify + +# If you want to enable optimization, you should include the +# following: +# -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* +# -optimizationpasses 5 +# -allowaccessmodification +# +# Note that you cannot just include these flags in your own +# configuration file; if you are including this file, optimization +# will be turned off. You'll need to either edit this file, or +# duplicate the contents of this file and remove the include of this +# file from your project's proguard.config path property. + +-keepattributes *Annotation* -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service -keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.app.backup.BackupAgent -keep public class * extends android.preference.Preference +-keep public class * extends android.support.v4.app.Fragment +-keep public class * extends android.app.Fragment -keep public class com.android.vending.licensing.ILicensingService +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native -keepclasseswithmembernames class * { native ; } +-keep public class * extends android.view.View { + public (android.content.Context); + public (android.content.Context, android.util.AttributeSet); + public (android.content.Context, android.util.AttributeSet, int); + public void set*(...); +} + -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet); } @@ -32,6 +62,7 @@ public void *(android.view.View); } +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); @@ -39,4 +70,13 @@ -keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; -} \ No newline at end of file +} + +-keepclassmembers class **.R$* { + public static ; +} + +# The support library contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontwarn android.support.** \ No newline at end of file diff --git a/FindMyCarFull/project.properties b/FindMyCarFull/project.properties index 54582a9..cbce924 100644 --- a/FindMyCarFull/project.properties +++ b/FindMyCarFull/project.properties @@ -11,6 +11,5 @@ split.density=false # Project target. target=Google Inc.:Google APIs:15 - #proguard.config=proguard.cfg -android.library.reference.1=../FindMyCarLib +android.library.reference.1=../FindMyCarLib \ No newline at end of file diff --git a/FindMyCarLib/.classpath b/FindMyCarLib/.classpath index e39cc86..3856341 100644 --- a/FindMyCarLib/.classpath +++ b/FindMyCarLib/.classpath @@ -4,6 +4,6 @@ - + diff --git a/FindMyCarLib/bin/findmycarlib.jar b/FindMyCarLib/bin/findmycarlib.jar index 8c899b0f183e195f57d7eb3b48210dfadc034270..81f4d630351c376f20dcbbd93da680305ec506e3 100644 GIT binary patch delta 1166 zcmY+BZAg<*6vsU}=b$-~In6oeHaF+XGqu232o^01T;`|`MTS^nX_}T9xk*@=WQdha zxn&k)7)Ecz4YNq8z$W%(P()NvLQ!GFo)!w>hqiO?Gjm^_-~FHed0qFctb0}#?{db- z5~CCfMO4B0t9|iXVnQFUIB9>-`&u4mS`!yU@HXj+X}{`1G&({L;?hAJtxNDNDfh!l zYvN0YcvNX2r6cJ~4AzosYtc-bbZ%6_MTt!x@(6}okvdeJ5sZ|en=InefSL}MI@#y}=P5S2Tx%y=ji93A+chlY-*tsgQd!Gpdt24OMhZCX z)U)rd46ElH7?CA}&affszuz|RYEL26H2PWN!4U`Xn?Xs7nv0hyYWnKPUpBksAr+R; zvijD0tXE%W1=Y7jFUwNW7S9?sx0FTaPhMi<_I0jjnURp`Y(E?IanBIzHRrPvml;;k zo4sN(ZZSCWE*9a~ZMPahoZP{hijy1Zx#v$=(K%l^9hhPfI_HZ;l?G?z>}ZSrMNK%{ z8#)nj36SC~`}P%uMSl^Q5MU*BfA_HeXa2_kYY=d1$apeX>CDd(7FzM^4lDdboMu~f z{b5^C-@*$$?|@kX3FL!{d`N<+u>9yoG6XS&T-JgkERj!Is6i-Ag=&P+RM>+Mr{l0+ zf+-2iX;6ipt~BoXB7sBCm0<}Woh#Mpup6@`(%~RNjscnxh73@TpfK{v^+u>e<&BYh zHk;rODq|*YHf2BqDi<@rji5BcVT29|eoIhmfffwCw{TB+CWmL4JXC1q%BU4iquG`P zO$gVrcqkzoj-%3(%}*yvurr67rzKdI3yo+V&4s-PN`VjGCUE7Wz_%!~@z9tJPN3PI W2ki(C^Z0@V`MkyTd~S{}fcAf`@1|k^ delta 1166 zcmY+BZAg<*6vsU}=b$-~In6oeHaF+XGqu232o^01T;`|`MTS^nX_}T9xk*@=WQe3p zxn&|`7)Ecz4YNq8z$W%(P()NvLQ!GFo)!w>hqiO?Gjm^_-~FHed0qFstb1M-?{db- z5~CCfMU=di!9Z+44Mn~vDTsnxObqT%|<$hRc zO?(Lvk18#sbR=Df!CG={Et+YQ&W%dAD6#279>H)cQirNDf{_w*n?+oCoV3p3gO+43 zrC`mC4n0q-w3E*UP}9*;CmTKBJjX_tYwcvG5maydxDr?znZ>t*ENCBsv zdJf%{VfCCNW3q(M8MZ|I_uJ)N?@Oly0<5L(?;iI5EdCf|4FXOLnM?*No%>nBLTi5AVTGTFvuvxb zKWr=NTY91A9WYBEfqYPr4@oc+mLJ_nh9IVpt6Fe`CGtrNH3+4tP>nF23I`D4bQ}&# zFe8CE4XV)7mBu|^Byi}tGAaS2bEP^R_G8vmIvhpFF+elIumS236h>aT-UxN5yfJdm zb`u;!Wx~YGrVMC6r7r{A2ud>?N9d5?w*<8oXu;5X3-^>~a(I@>LxonZj9cM6nr&Io zgfNoDLkZb%8kL@GemYTty*b=GE5W8*XhidPE*wNq3VirBfh!*czD1dhhbC-r2F><7 WXh(RM#}_Qf=Pj=1b8~zFwEqKvhkH^0 diff --git a/FindMyCarLite/.classpath b/FindMyCarLite/.classpath index fa8c828..ada6705 100644 --- a/FindMyCarLite/.classpath +++ b/FindMyCarLite/.classpath @@ -5,6 +5,6 @@ - + diff --git a/FindMyCarLite/AndroidManifest.xml b/FindMyCarLite/AndroidManifest.xml index d21edb8..530926c 100644 --- a/FindMyCarLite/AndroidManifest.xml +++ b/FindMyCarLite/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/FindMyCarLite/proguard.cfg b/FindMyCarLite/proguard.cfg index 5a20228..f94b36f 100644 --- a/FindMyCarLite/proguard.cfg +++ b/FindMyCarLite/proguard.cfg @@ -1,32 +1,69 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html -renamesourcefileattribute SourceFile -keepattributes SourceFile,LineNumberTable -flattenpackagehierarchy --dontoptimize +-dontusemixedcaseclassnames -dontskipnonpubliclibraryclasses --dontpreverify -verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* +-dontoptimize +-dontpreverify +# 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). +-dontoptimize +-dontpreverify + +# If you want to enable optimization, you should include the +# following: +# -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* +# -optimizationpasses 5 +# -allowaccessmodification +# +# Note that you cannot just include these flags in your own +# configuration file; if you are including this file, optimization +# will be turned off. You'll need to either edit this file, or +# duplicate the contents of this file and remove the include of this +# file from your project's proguard.config path property. + +-keepattributes *Annotation* -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service -keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService +-keep public class * extends android.app.backup.BackupAgent -keep public class * extends android.preference.Preference +-keep public class * extends android.support.v4.app.Fragment +-keep public class * extends android.app.Fragment +-keep public class com.android.vending.licensing.ILicensingService +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native -keepclasseswithmembernames class * { native ; } --keepclasseswithmembernames class * { +-keep public class * extends android.view.View { + public (android.content.Context); + public (android.content.Context, android.util.AttributeSet); + public (android.content.Context, android.util.AttributeSet, int); + public void set*(...); +} + +-keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet); } --keepclasseswithmembernames class * { +-keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet, int); } +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); @@ -35,3 +72,12 @@ -keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; } + +-keepclassmembers class **.R$* { + public static ; +} + +# The support library contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontwarn android.support.** \ No newline at end of file diff --git a/FindMyCarLite/project.properties b/FindMyCarLite/project.properties index 6239499..f8d8c8d 100644 --- a/FindMyCarLite/project.properties +++ b/FindMyCarLite/project.properties @@ -12,5 +12,4 @@ split.density=false android.library.reference.1=../FindMyCarLib/ # Project target. target=Google Inc.:Google APIs:15 - -#proguard.config=proguard.cfg +#proguard.config=proguard.cfg \ No newline at end of file