Commit d6cd4a4a authored by Eli Lindsey's avatar Eli Lindsey Committed by Facebook Github Bot

use folly singleton relaxed init on android

Summary: fixing D4825412

Reviewed By: lbrandy

Differential Revision: D4826815

fbshipit-source-id: 94691ff293dad53b16e7a2f139c1df490a61e565
parent 96791c45
......@@ -28,7 +28,7 @@
#include <folly/ScopeGuard.h>
#if !defined(_WIN32) && !defined(__APPLE__)
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
static void hs_init_weak(int* argc, char** argv[])
__attribute__((__weakref__("hs_init")));
#endif
......@@ -36,7 +36,7 @@ static void hs_init_weak(int* argc, char** argv[])
namespace folly {
SingletonVault::Type SingletonVault::defaultVaultType() {
#if !defined(_WIN32) && !defined(__APPLE__)
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
bool isPython = dlsym(RTLD_DEFAULT, "Py_Main");
bool isHaskel = &::hs_init_weak || dlsym(RTLD_DEFAULT, "hs_init");
bool isJVM = dlsym(RTLD_DEFAULT, "JNI_GetCreatedJavaVMs");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment