Skip to content
Snippets Groups Projects
Verified Commit 336869f7 authored by Matthew Finkel's avatar Matthew Finkel Committed by ma1
Browse files

Bug 24796: Comment out excess permissions from GeckoView

The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
parent dcb2de45
No related branches found
No related tags found
1 merge request!1326Bug 43383: Rebased legacy onto 115.19.0esr
......@@ -6,21 +6,33 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mozilla.geckoview">
<!--#ifdef MOZ_ANDROID_NETWORK_STATE-->
<!--
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-->
<!--#endif-->
<uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<!--#ifdef MOZ_ANDROID_LOCATION-->
<!--
<uses-feature
android:name="android.hardware.location"
android:required="false"/>
<uses-feature
android:name="android.hardware.location.gps"
android:required="false"/>
-->
<!--#endif-->
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>
<!--#ifdef MOZ_WEBRTC-->
<!-- TODO preprocess AndroidManifest.xml so that we can
conditionally include WebRTC permissions based on MOZ_WEBRTC. -->
<!--
<uses-feature
android:name="android.hardware.camera"
android:required="false"/>
......@@ -37,6 +49,8 @@
<uses-feature
android:name="android.hardware.camera.any"
android:required="false"/>
-->
<!--#endif-->
<!-- GeckoView requires OpenGL ES 2.0 -->
<uses-feature
......
......@@ -100,3 +100,15 @@ set_config(
"MOZ_ANDROID_FAT_AAR_ARCHITECTURES",
depends("MOZ_ANDROID_FAT_AAR_ARCHITECTURES")(lambda x: x),
)
project_flag(
"MOZ_ANDROID_NETWORK_STATE",
help="Include permission for accessing WiFi/network state on Android",
default=False,
)
project_flag(
"MOZ_ANDROID_LOCATION",
help="Include permission for accessing fine and course-grain Location on Android",
default=False,
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment