Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-03-12 09:00:51 +08:00
commit e54fcd15f1
56 changed files with 23 additions and 1671 deletions

View file

@ -130,8 +130,6 @@ MOZ_SAFE_BROWSING:
false,
#endif
# NOTE! XP_LINUX has to go after MOZ_WIDGET_ANDROID otherwise Android
# builds will be misidentified as linux.
platform:
#ifdef MOZ_WIDGET_GTK
"linux",
@ -139,8 +137,6 @@ MOZ_SAFE_BROWSING:
"win",
#elif XP_MACOSX
"macosx",
#elif MOZ_WIDGET_ANDROID
"android",
#elif XP_LINUX
"linux",
#else