Merged PR 1086645: Get rid of some legacy #ifdef ANDROID blocks.
Get rid of some legacy #ifdef ANDROID blocks.
This commit is contained in:
Коммит
c7f81bfc86
|
@ -98,11 +98,6 @@ namespace ARIASDK_NS_BEGIN {
|
|||
ILogConfiguration& logConfiguration,
|
||||
status_t& status,
|
||||
IHttpClient* httpClient
|
||||
#ifdef ANDROID
|
||||
, JNIEnv * env
|
||||
, jclass contextClass
|
||||
, jobject contextObject
|
||||
#endif
|
||||
)
|
||||
{
|
||||
auto result = instance().lease(logConfiguration, httpClient);
|
||||
|
@ -115,11 +110,6 @@ namespace ARIASDK_NS_BEGIN {
|
|||
static ILogManager * Get(
|
||||
ILogConfiguration& logConfiguration,
|
||||
status_t& status
|
||||
#ifdef ANDROID
|
||||
, JNIEnv * env
|
||||
, jclass contextClass
|
||||
, jobject contextObject
|
||||
#endif
|
||||
)
|
||||
{
|
||||
return Get(logConfiguration, status, nullptr);
|
||||
|
@ -128,11 +118,6 @@ namespace ARIASDK_NS_BEGIN {
|
|||
static ILogManager* Get(
|
||||
const char * module,
|
||||
status_t& status
|
||||
#ifdef ANDROID
|
||||
JNIEnv *env,
|
||||
jclass contextClass,
|
||||
jobject contextObject,
|
||||
#endif
|
||||
)
|
||||
{
|
||||
ILogConfiguration config =
|
||||
|
|
|
@ -8,11 +8,6 @@ namespace ARIASDK_NS_BEGIN {
|
|||
ILogConfiguration & config,
|
||||
status_t &status,
|
||||
IHttpClient* httpClient
|
||||
#ifdef ANDROID
|
||||
, JNIEnv * env
|
||||
, jclass contextClass
|
||||
, jobject contextObject
|
||||
#endif
|
||||
)
|
||||
{
|
||||
return LogManagerFactory::Get(config, status, httpClient);
|
||||
|
@ -22,11 +17,6 @@ namespace ARIASDK_NS_BEGIN {
|
|||
ILogManager* LogManagerProvider::Get(
|
||||
const char * moduleName,
|
||||
status_t& status
|
||||
#ifdef ANDROID
|
||||
JNIEnv *env,
|
||||
jclass contextClass,
|
||||
jobject contextObject,
|
||||
#endif
|
||||
)
|
||||
{
|
||||
return LogManagerFactory::Get(moduleName, status);
|
||||
|
|
Загрузка…
Ссылка в новой задаче