From 1470aaec9efe698e8ce6b654663fb9683746812d Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Mon, 4 Sep 2017 14:24:12 +0200
Subject: tdf#112190 installLocation should be specified in toplevel manifest

Thanks to Petr Vorel for catching this.
Fixes portion of 66518ead516e90d606e87c6ce58ec11fea6d172e that added
back the android:installLocation placeholder

Change-Id: Ibd3333dfafb65fabcb5df3f7a6626a00f5d71bc9
---
 android/source/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'android')

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index 54ab1d4ba7c0..97db04865f1e 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="${installLocation}"
     package="org.libreoffice">
 
     <!-- App requires OpenGL ES 2.0 -->
@@ -14,7 +15,6 @@
         android:allowBackup="true"
         android:extractNativeLibs="${extractNativeLibs}"
         android:icon="@mipmap/ic_launcher"
-        android:installLocation="${installLocation}"
         android:label="@string/app_name"
         android:theme="@style/LibreOfficeTheme"
         android:debuggable="true"
-- 
cgit