From 89fcaddd24fe5d706ebb07e9e0d7ac1eb8709f40 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Wed, 25 Jun 2014 16:03:53 -1000
Subject: [PATCH] =?UTF-8?q?[android]=20Now=20it=E2=80=99s=20possible=20to?=
 =?UTF-8?q?=20install=20debug=20version=20together=20with=20production=20o?=
 =?UTF-8?q?r=20beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/build.gradle                      | 1 +
 android/flavors/debug/AndroidManifest.xml | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 android/flavors/debug/AndroidManifest.xml

diff --git a/android/build.gradle b/android/build.gradle
index 9224d49a60..082780692f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -153,6 +153,7 @@ android {
       versionNameSuffix '-debug'
       jniDebugBuild true           // Enable jni debug build
       zipAlign true
+      android.sourceSets.debug.setRoot('flavors/debug')
     }
 
     release {
diff --git a/android/flavors/debug/AndroidManifest.xml b/android/flavors/debug/AndroidManifest.xml
new file mode 100644
index 0000000000..3671a9eaec
--- /dev/null
+++ b/android/flavors/debug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto">
+    <!-- Debug manifest doesn't contain sharedUser values to avoid installation conflicts with production versions -->
+</manifest>