diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /xpcom/components/ManifestParser.cpp | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'xpcom/components/ManifestParser.cpp')
| -rw-r--r-- | xpcom/components/ManifestParser.cpp | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 7188c0ec5..b69a204ba 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -21,10 +21,6 @@ #include <gtk/gtk.h> #endif -#ifdef MOZ_WIDGET_ANDROID -#include "AndroidBridge.h" -#endif - #include "mozilla/Services.h" #include "nsCRT.h" @@ -478,9 +474,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kABI, "abi"); NS_NAMED_LITERAL_STRING(kProcess, "process"); -#if defined(MOZ_WIDGET_ANDROID) - NS_NAMED_LITERAL_STRING(kTablet, "tablet"); -#endif NS_NAMED_LITERAL_STRING(kMain, "main"); NS_NAMED_LITERAL_STRING(kContent, "content"); @@ -557,14 +550,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version, gtk_minor_version); -#elif defined(MOZ_WIDGET_ANDROID) - bool isTablet = false; - if (mozilla::AndroidBridge::Bridge()) { - mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", - "RELEASE", - osVersion); - isTablet = java::GeckoAppShell::IsTablet(); - } #endif if (XRE_IsContentProcess()) { @@ -665,9 +650,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, TriState stOs = eUnspecified; TriState stABI = eUnspecified; TriState stProcess = eUnspecified; -#if defined(MOZ_WIDGET_ANDROID) - TriState stTablet = eUnspecified; -#endif + int flags = 0; while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && @@ -685,14 +668,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, continue; } -#if defined(MOZ_WIDGET_ANDROID) - bool tablet = false; - if (CheckFlag(kTablet, wtoken, tablet)) { - stTablet = (tablet == isTablet) ? eOK : eBad; - continue; - } -#endif - if (directive->contentflags) { bool flag; if (CheckFlag(kPlatform, wtoken, flag)) { @@ -737,9 +712,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || -#ifdef MOZ_WIDGET_ANDROID - stTablet == eBad || -#endif stABI == eBad || stProcess == eBad) { continue; |