summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml.jinja2
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-11-10 17:23:04 -0800
committerjrizzoli <joey@cyanogenmoditalia.it>2015-11-27 16:34:38 +0100
commitfc32e2d42ef5e55d70392707db41650651d021c2 (patch)
treef05d891932c5588862b7e261612f09fe38458445 /AndroidManifest.xml.jinja2
parentd624c97846ced89f10af9f8baedb077a9f128b9b (diff)
downloadandroid_packages_apps_Gello-fc32e2d42ef5e55d70392707db41650651d021c2.tar.gz
android_packages_apps_Gello-fc32e2d42ef5e55d70392707db41650651d021c2.tar.bz2
android_packages_apps_Gello-fc32e2d42ef5e55d70392707db41650651d021c2.zip
Add support to add extra gl texture to Android manifest
Conflicts: AndroidManifest.xml.jinja2
Diffstat (limited to 'AndroidManifest.xml.jinja2')
-rw-r--r--AndroidManifest.xml.jinja23
1 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index feca4024..cc4c0436 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -49,6 +49,7 @@
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+
<!-- Templatize taskAffinity otherwise it will default to 'package'
defined in manifest -->
<application android:name="com.android.browser.Browser"
@@ -431,6 +432,8 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+ {{ extra_supports_gl_texture }}
+
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
</manifest>