commit 44efced5d4722098dc21a98df3e430e6eb0fb9cb Author: Nathan Freitas nathan@freitas.net Date: Wed Feb 4 16:54:18 2015 -0500

update build files (tmp fix for now) --- procfg.txt | 32 -------------------------------- proguard-project.txt | 48 ++++++++++++++++++++++++++++++------------------ project.properties | 2 +- update-ant-build.sh | 3 +++ 4 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/procfg.txt b/procfg.txt deleted file mode 100644 index 7d2b51f..0000000 --- a/procfg.txt +++ /dev/null @@ -1,32 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --dontobfuscate --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --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 - --keepclasseswithmembernames class * { - native <methods>; -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - diff --git a/proguard-project.txt b/proguard-project.txt index f2fe155..7d2b51f 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,20 +1,32 @@ -# 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. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontpreverify +-dontobfuscate +-verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*

-# Add any project specific keep options here: +-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 + +-keepclasseswithmembernames class * { + native <methods>; +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +}

-# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/project.properties b/project.properties index 7f2e988..7300f9d 100644 --- a/project.properties +++ b/project.properties @@ -6,7 +6,7 @@ # To customize properties used by the Ant build system use, # "ant.properties", and override values to adapt the script to your # project structure. -proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt +#proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt

# Project target. target=android-21 diff --git a/update-ant-build.sh b/update-ant-build.sh index c87a05b..0bcbac2 100755 --- a/update-ant-build.sh +++ b/update-ant-build.sh @@ -4,3 +4,6 @@ android update project -t android-21 --path . --name Orbot --subprojects android update lib-project -t android-21 --path external/appcompat android update lib-project -t android-21 --path external/superuser-commands/RootCommands-Library/ +android update lib-project -t android-21 --path ../Orweb +android update lib-project -t android-21 --path ../OnionKit/libnetcipher +