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

This commit is contained in:
roytam1 2021-03-11 10:14:22 +08:00
commit 333a06698b
41 changed files with 1 additions and 1192 deletions

View file

@ -208,13 +208,6 @@ MOZ_SAFE_BROWSING:
false,
#endif
MOZ_ANDROID_HISTORY:
#ifdef MOZ_ANDROID_HISTORY
true,
#else
false,
#endif
MOZ_TOOLKIT_SEARCH:
#ifdef MOZ_TOOLKIT_SEARCH
true,
@ -222,13 +215,6 @@ MOZ_SAFE_BROWSING:
false,
#endif
MOZ_ANDROID_ACTIVITY_STREAM:
#ifdef MOZ_ANDROID_ACTIVITY_STREAM
true,
#else
false,
#endif
DLL_PREFIX: "@DLL_PREFIX@",
DLL_SUFFIX: "@DLL_SUFFIX@",