diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2015-01-04 20:22:01 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2015-01-04 20:22:01 +0100 |
| commit | d0d58d7d04ea30f050ee3bd4563c2595acad2d15 (patch) | |
| tree | e5c866db2f91c4a2839f3cc60ee6be1235b4fb19 /play-services-location | |
| parent | e8fbb17be64ab2d0b9e4ef7f241c28176d9f499c (diff) | |
| download | cgeo-d0d58d7d04ea30f050ee3bd4563c2595acad2d15.zip cgeo-d0d58d7d04ea30f050ee3bd4563c2595acad2d15.tar.gz cgeo-d0d58d7d04ea30f050ee3bd4563c2595acad2d15.tar.bz2 | |
#4585: fix Ant build
* play-services-location must depend on play-services-base
* some classes and methods of newer API versions need to be ignored in
proguard
Diffstat (limited to 'play-services-location')
| -rw-r--r-- | play-services-location/proguard.txt | 5 | ||||
| -rw-r--r-- | play-services-location/project.properties | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/play-services-location/proguard.txt b/play-services-location/proguard.txt index 0c9693a..199d972 100644 --- a/play-services-location/proguard.txt +++ b/play-services-location/proguard.txt @@ -17,4 +17,7 @@ # Needed for Parcelable/SafeParcelable Creators to not get stripped -keepnames class * implements android.os.Parcelable { public static final ** CREATOR; -}
\ No newline at end of file +} + +-dontwarn com.google.android.gms.common.** +-dontwarn com.google.android.gms.internal.**
\ No newline at end of file diff --git a/play-services-location/project.properties b/play-services-location/project.properties index ad36a32..8a32119 100644 --- a/play-services-location/project.properties +++ b/play-services-location/project.properties @@ -13,3 +13,4 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.txt # Project target. target=Google Inc.:Google APIs:19 android.library=true +android.library.reference.1=../play-services-base |