summaryrefslogtreecommitdiffstats
path: root/mobile
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-27 15:57:18 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-27 15:57:18 +0200
commitd990d8ab2cade6c928e8bbe56ae038d020cef599 (patch)
treec7561ae0f303cb0d4a7a7507178531b4852e4dea /mobile
parent0c36b27511c1fbca594f0426c493ef601fda3e4c (diff)
parent8d5ec757ece850fb7ad5c712868f305636e41177 (diff)
downloadUXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar
UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.gz
UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.lz
UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.xz
UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_array_values_1
Diffstat (limited to 'mobile')
-rw-r--r--mobile/android/app/mobile.js6
-rw-r--r--mobile/android/configure.in12
-rw-r--r--mobile/android/confvars.sh3
3 files changed, 19 insertions, 2 deletions
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 2a64297c4..9a28bd716 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -627,6 +627,12 @@ pref("media.mediasource.enabled", true);
pref("media.mediadrm-widevinecdm.visible", true);
+#ifdef MOZ_EME
+// Enable EME(Encrypted media extensions?)
+pref("media.eme.enabled", false);
+pref("media.eme.apiVisible", false);
+#endif
+
// optimize images memory usage
pref("image.downscale-during-decode.enabled", true);
diff --git a/mobile/android/configure.in b/mobile/android/configure.in
new file mode 100644
index 000000000..9e13f39b3
--- /dev/null
+++ b/mobile/android/configure.in
@@ -0,0 +1,12 @@
+dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*-
+dnl vi: set tabstop=2 shiftwidth=2 expandtab:
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+dnl Things we need to carry from confvars.sh
+AC_DEFINE(MOZ_FENNEC)
+AC_SUBST(MOZ_FENNEC)
+
+dnl Optional parts of the build.
+
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index f2c7ec113..a804afe22 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -4,6 +4,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
+MOZ_FENNEC=1
MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
@@ -30,8 +31,6 @@ MOZ_XULRUNNER=
MOZ_CAPTURE=1
MOZ_RAW=1
-MOZ_RUST_MP4PARSE=1
-
# use custom widget for html:select
MOZ_USE_NATIVE_POPUP_WINDOWS=1