Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1415)

Unified Diff: runtime/vm/signal_handler.h

Issue 539573003: Adds support for building arm64 Android. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/os_android.cc ('k') | runtime/vm/signal_handler_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/signal_handler.h
===================================================================
--- runtime/vm/signal_handler.h (revision 39843)
+++ runtime/vm/signal_handler.h (working copy)
@@ -12,6 +12,9 @@
#include <signal.h> // NOLINT
#include <ucontext.h> // NOLINT
#elif defined(TARGET_OS_ANDROID)
+#include <android/api-level.h> // NOLINT
+/* Android <= 19 doesn't have ucontext.h */
+#if __ANDROID_API__ <= 19
#include <signal.h> // NOLINT
#include <asm/sigcontext.h> // NOLINT
// These are not defined on Android, so we have to define them here.
@@ -23,6 +26,11 @@
struct sigcontext uc_mcontext;
uint32_t uc_sigmask;
} ucontext_t;
+#else
+// Android > 19 has ucontext.h
+#include <signal.h> // NOLINT
+#include <ucontext.h> // NOLINT
+#endif // __ANDROID_API__ <= 19
#elif defined(TARGET_OS_MACOS)
#include <signal.h> // NOLINT
#include <sys/ucontext.h> // NOLINT
« no previous file with comments | « runtime/vm/os_android.cc ('k') | runtime/vm/signal_handler_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698