Post landing fixes

TBR

Review URL: https://codereview.chromium.org//65983005

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@30420 260f80e4-7a28-3924-810f-c04153c831b5

runtime/vm/profiler.cc

@@ -201,6 +201,10 @@ void ProfilerManager::ResizeIsolates(intptr_t new_capacity) {
 
 
 void ProfilerManager::AddIsolate(Isolate* isolate) {
+  if (isolates_ == NULL) {
+    // We are shutting down.
+    return;
+  }
   // Must be called with monitor_ locked.
   if (isolates_size_ == isolates_capacity_) {
     ResizeIsolates(isolates_capacity_ == 0 ? 16 : isolates_capacity_ * 2);

runtime/vm/profiler_macos.cc

@@ -28,8 +28,8 @@ static void CollectSample(IsolateProfilerData* profiler_data,
   // Issue # 14777
   sample->vm_tags = Sample::kExecuting;
   sample->runtime_tags = 0;
-  int64_t cpu_usage;
-  Thread::GetThreadCpuUsage(profiler_data->thread_id(), &cpu_usage);
+  int64_t cpu_usage = 0;
+  // TODO(johnmccutchan): Thread::GetThreadCpuUsage on MacOS.
   sample->cpu_usage = profiler_data->ComputeDeltaAndSetCpuUsage(cpu_usage);
   ProfilerSampleStackWalker stackWalker(sample, stack_lower, stack_upper,
                                         pc, fp, sp);

runtime/vm/signal_handler.h

@@ -12,8 +12,8 @@
 #include <signal.h>  // NOLINT
 #include <ucontext.h>  // NOLINT
 #elif defined(TARGET_OS_ANDROID)
-#include <signal.h>  // NOLINT
-#include <ucontext.h>  // NOLINT
+#include <asm/signal.h>  // NOLINT
+#include <asm/sigcontext.h>  // NOLINT
 #elif defined(TARGET_OS_MACOS)
 #include <signal.h>  // NOLINT
 #include <sys/ucontext.h>  // NOLINT

tools/gyp/configurations_make.gypi

@@ -20,7 +20,6 @@
           '-Woverloaded-virtual',
           '-g3',
           '-ggdb3',
-	        '-rdynamic',
           # TODO(iposva): Figure out if we need to pass anything else.
           #'-ansi',
           '-fno-rtti',