diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-11-06 15:59:35 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-11-06 15:59:35 -0330 |
| commit | ab3d2aef89bfb689a8cd70a34481b1862bfd5b3b (patch) | |
| tree | 61fe5b9faf185315b1d80753ee18b671cadbe227 /android | |
| parent | Freze jar was improperly named in demo scripts (diff) | |
| download | ice-ab3d2aef89bfb689a8cd70a34481b1862bfd5b3b.tar.bz2 ice-ab3d2aef89bfb689a8cd70a34481b1862bfd5b3b.tar.xz ice-ab3d2aef89bfb689a8cd70a34481b1862bfd5b3b.zip | |
Lots of small changes and cleanups as suggested by IntelliJ.
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle | 6 | ||||
| -rw-r--r-- | android/test/android/build.gradle | 2 | ||||
| -rw-r--r-- | android/test/android/proguard.cfg | 18 |
3 files changed, 14 insertions, 12 deletions
diff --git a/android/build.gradle b/android/build.gradle index 5fe204941cd..d71c01d3e40 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,10 +20,10 @@ subprojects { apply plugin: 'idea' // The Android versions used by subprojects. - ext.ice_compileSdkVersion = 21 + ext.ice_compileSdkVersion = 17 ext.ice_buildToolsVersion = "21.1.0" - ext.ice_minSdkVersion = 21 - ext.ice_targetSdkVersion = 21 + ext.ice_minSdkVersion = 17 + ext.ice_targetSdkVersion = 17 repositories { maven { diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle index c013be1c3df..57f653c6d19 100644 --- a/android/test/android/build.gradle +++ b/android/test/android/build.gradle @@ -32,7 +32,7 @@ android { } release { - runProguard true + runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' } } diff --git a/android/test/android/proguard.cfg b/android/test/android/proguard.cfg index 4f1735013b0..4733d92557f 100644 --- a/android/test/android/proguard.cfg +++ b/android/test/android/proguard.cfg @@ -63,14 +63,16 @@ -keepnames class ** { *; } --keep class test.Ice.** { - *; -} --keep interface test.Ice.** --keep interface Ice.** --keep interface IceInternal.** --keep class Ice.** --keep class IceInternal.** +-keep class test.Ice.** { *; } + +-keep class Ice.** { *; } +-keep enum Ice.** { *; } + +-keep class IceSSL.** { *; } +-keep enum IceSSL.** { *; } + +-keep class IceInternal.** { *; } +-keep enum IceInternal.** { *; } # For debugging. -keepattributes LocalVariableTable, LocalVariableTypeTable |