Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2017-06-09 18:25:32 +0300
committerGitHub <noreply@github.com>2017-06-09 18:25:32 +0300
commitc2247fccc3076b59732f642bfe671c837198ea8f (patch)
tree9332c7bd9afbb2be0310af2730115b5a82880e5a
parent5073d0155d474fa5cc598cc09ca63322e10515e9 (diff)
parent24d55e44aab52c8c40d90796ad4d1e636689bdd3 (diff)
Merge pull request #6236 from alexzatsepin/fix-mytarget-build-relelasebeta-861beta-856
[android] Fixed proguard mytarget build
-rw-r--r--android/AndroidManifest.xml4
-rw-r--r--android/proguard-mwm.txt5
2 files changed, 4 insertions, 5 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7bfa1195b5..1985c4c760 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -331,10 +331,6 @@
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
- <activity
- android:name="ru.mail.android.mytarget.ads.MyTargetActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
-
<activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/>
<receiver
diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt
index 65326b03ef..455d402a17 100644
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@@ -19,7 +19,10 @@
-dontwarn com.arellomobile.**
# myTarget
--keep class com.my.target.** {*;}
+# Remove this dontwarn when MyTarget is updated to 4.6.15
+-dontwarn com.my.target.nativeads.mediation.**
+# Remove this dontwarn when MyTarget is updated to 4.6.16
+-dontwarn com.my.target.core.net.cookie.**
-dontwarn com.mopub.**
-dontoptimize