From 94bed3ad148a6ecba91c0a32e0ee52deda3aec9f Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Fri, 19 Apr 2013 12:20:58 +0200
Subject: Make it possible to bundle Qt libraries in Android apk

Add the enablers so that Qt Creator (or another
deployment tool) can add a specification in the app's
meta data of which libraries are bundled and the
Java code required to extract plugins and imports into
the required directory structure inside the app's
data directory.

This is intended to be an alternative to using Ministro
for deployment, and the mechanism of extracting
libraries on first startup is a work-around for the
requirement in Qt of having this directory structure.
For Qt 5.2, the approach should be changed to load
plugins directly from the app's lib directory and
the other files in imports will be bundled as qrcs
in the native plugins.

Task-number: QTBUG-30751
Change-Id: Ibdb3a672548b4802f9bf3ecd05fc194426ac30e7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/android/java/res/values/libs.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/android/java/res/values/libs.xml')

diff --git a/src/android/java/res/values/libs.xml b/src/android/java/res/values/libs.xml
index f47174e3d3..09fa409458 100644
--- a/src/android/java/res/values/libs.xml
+++ b/src/android/java/res/values/libs.xml
@@ -8,4 +8,6 @@
         <item>Qt5Core</item>
     </array>
     <array name="bundled_libs"/>
+    <array name="bundled_in_lib" />
+    <array name="bundled_in_assets" />
 </resources>
-- 
cgit v1.2.3