Android conditionals

lmbelo · lmbelo · commit 0763a241617f · 2021-06-03T14:00:00.000-07:00
diff --git a/Source/Definition.Inc b/Source/Definition.Inc
@@ -202,6 +202,12 @@
   {$ENDIF UNIX}
 {$ENDIF FPC}
 
+{$IFDEF ANDROID}
+  {$IFDEF CPU64BITS}
+    {$DEFINE CPUX64}
+  {$ENDIF}
+{$ENDIF}
+
 {$IFDEF DELPHIXE_OR_HIGHER}
   {$DEFINE EXTENDED_RTTI}
 {$ENDIF DELPHIXE_OR_HIGHER}
diff --git a/Source/VarPyth.pas b/Source/VarPyth.pas
@@ -148,7 +148,7 @@   TNamedParamDesc = record
 
 {$IFDEF DELPHIXE2_OR_HIGHER}
   {$DEFINE USESYSTEMDISPINVOKE}  //Delphi 2010 DispInvoke is buggy
-  {$IF defined(OSX64) or defined(LINUX) or not defined(DELPHI10_4_OR_HIGHER)}
+  {$IF defined(OSX64) or defined(LINUX) or defined(ANDROID) or not defined(DELPHI10_4_OR_HIGHER)}
     {$DEFINE PATCHEDSYSTEMDISPINVOKE}  //To correct memory leaks
   {$IFEND}
 {$ENDIF}
@@ -949,7 +949,7 @@ procedure SetClearVarToEmptyParam(var V: TVarData);
   CPropertyGet = $02;
   CPropertySet = $04;
 
-{$IF defined(PATCHEDSYSTEMDISPINVOKE) and (defined(OSX64) or defined(LINUX))}
+{$IF defined(PATCHEDSYSTEMDISPINVOKE) and (defined(OSX64) or defined(LINUX) or defined(ANDROID))}
 {
    Fixes https://quality.embarcadero.com/browse/RSP-28097
 }
