зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1551297 - Use MOZ_WIDGET_ANDROID instead of ANDROID when targeting Java r=jcj
ANDROID is true for platforms based only on the native parts of the stack so can't be used when what you depend on is actually the Java layer. Differential Revision: https://phabricator.services.mozilla.com/D30965 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
f40ac82e3f
Коммит
3b8efb7695
|
@ -16,7 +16,7 @@
|
|||
#include "mozilla/Unused.h"
|
||||
#include "nsTextFormatter.h"
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifdef MOZ_WIDGET_ANDROID
|
||||
# include "mozilla/dom/AndroidWebAuthnTokenManager.h"
|
||||
#endif
|
||||
|
||||
|
@ -268,7 +268,7 @@ RefPtr<U2FTokenTransport> U2FTokenManager::GetTokenManagerImpl() {
|
|||
|
||||
auto pm = U2FPrefManager::Get();
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifdef MOZ_WIDGET_ANDROID
|
||||
// On Android, prefer the platform support if enabled.
|
||||
if (pm->GetAndroidFido2Enabled()) {
|
||||
return AndroidWebAuthnTokenManager::GetInstance();
|
||||
|
|
|
@ -63,7 +63,7 @@ LOCAL_INCLUDES += [
|
|||
'/security/manager/ssl',
|
||||
]
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
EXPORTS.mozilla.dom += [
|
||||
'AndroidWebAuthnTokenManager.h',
|
||||
]
|
||||
|
|
Загрузка…
Ссылка в новой задаче