commit d6a763ebd16c52091b3c6220d320abc900d75442
author Daco Harkes <dacoharkes@google.com> Wed Feb 13 14:55:58 2019 +0000
committer Samir Jindel <sjindel@google.com> Wed Feb 13 14:55:58 2019 +0000
tree 4308c238d8f4436e0ca57162ff546b4dde527850
parent cf5a7cf36a998d922081b2209edcb18c60d4b0c2

[vm / library] dart:ffi fix android build

Change-Id: I56f45b13f7c8d92e75f8c596290c2666276f65a1
Cq-Include-Trybots: luci.dart.try:vm-kernel-precomp-android-release-arm-try
Reviewed-on: https://dart-review.googlesource.com/c/93026
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Samir Jindel <sjindel@google.com>
Auto-Submit: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Samir Jindel <sjindel@google.com>

runtime/lib/ffi_dynamic_library.cc

diff --git a/runtime/lib/ffi_dynamic_library.cc b/runtime/lib/ffi_dynamic_library.cc
index 0d6a614..b083e04 100644
--- a/runtime/lib/ffi_dynamic_library.cc
+++ b/runtime/lib/ffi_dynamic_library.cc
@@ -57,11 +57,11 @@
 }
 
 DEFINE_NATIVE_ENTRY(Ffi_dl_open, 0, 1) {
-  GET_NON_NULL_NATIVE_ARGUMENT(String, argName, arguments->NativeArgAt(0));
-
 #if !defined(TARGET_OS_LINUX) && !defined(TARGET_OS_MACOS)
   UNREACHABLE();
 #else
+  GET_NON_NULL_NATIVE_ARGUMENT(String, argName, arguments->NativeArgAt(0));
+
   dlerror();  // Clear any errors.
   void* handle = dlopen(LibraryPath(argName.ToCString()), RTLD_LAZY);
   if (handle == nullptr) {
@@ -76,15 +76,15 @@
 }
 
 DEFINE_NATIVE_ENTRY(Ffi_dl_lookup, 1, 2) {
+#if !defined(TARGET_OS_LINUX) && !defined(TARGET_OS_MACOS)
+  UNREACHABLE();
+#else
   GET_NATIVE_TYPE_ARGUMENT(type_arg, arguments->NativeTypeArgAt(0));
 
   GET_NON_NULL_NATIVE_ARGUMENT(DynamicLibrary, dlib, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, argSymbolName,
                                arguments->NativeArgAt(1));
 
-#if !defined(TARGET_OS_LINUX) && !defined(TARGET_OS_MACOS)
-  UNREACHABLE();
-#else
   void* handle = dlib.GetHandle();
 
   dlerror();  // Clear any errors.