commit a0d80513e38794b27b870d2d1dd2838337a414ef
author Primiano Tucci <primiano@google.com> Sun Feb 18 00:09:23 2018 +0000
committer Primiano Tucci <primiano@google.com> Sun Feb 18 00:09:23 2018 +0000
tree fdba9f58e7c5ec038e2c60cc9e746d948fd1b1f1
parent 3e8fbf61199a93f5736a1412616c0bd7cf6a8fd4

Fix mac build

Change-Id: Ie23fb9d5ab35031e3756f79569ba767a75109d64

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 4995177..766afbb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,10 +29,12 @@
     "src/ipc/protoc_plugin:ipc_plugin($host_toolchain)",
     "src/protozero/protoc_plugin($host_toolchain)",
     "tools/dump_process_data",
-    "tools/ftrace_proto_gen:ftrace_proto_gen",
     "tools/proto_to_cpp",
     "tools/trace_to_text",
   ]
+  if (is_linux || is_android) {
+    deps += [ "tools/ftrace_proto_gen:ftrace_proto_gen" ]
+  }
   if (!build_with_chromium) {
     deps += [
       "protos/perfetto/config:merged_config",  # For syntax-checking the proto.
@@ -57,12 +59,16 @@
     "gn:default_deps",
     "gn:gtest_main",
     "src/base:base_unittests",
-    "src/ftrace_reader:ftrace_reader_unittests",
     "src/ipc:perfetto_ipc_unittests",
     "src/protozero:protozero_unittests",
     "src/tracing:tracing_unittests",
-    "tools/ftrace_proto_gen:ftrace_proto_gen_unittests",
   ]
+  if (is_linux || is_android) {
+    deps += [
+      "src/ftrace_reader:ftrace_reader_unittests",
+      "tools/ftrace_proto_gen:ftrace_proto_gen_unittests",
+    ]
+  }
   if (!build_with_chromium) {
     deps += [ "tools/sanitizers_unittests" ]
   }

src/base/test/vm_test_utils.cc

diff --git a/src/base/test/vm_test_utils.cc b/src/base/test/vm_test_utils.cc
index f41654c..3b8688c 100644
--- a/src/base/test/vm_test_utils.cc
+++ b/src/base/test/vm_test_utils.cc
@@ -33,8 +33,10 @@
 bool IsMapped(void* start, size_t size) {
 #if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX)
   using PageState = char;
+  static constexpr PageState kIncoreMask = MINCORE_INCORE;
 #else
   using PageState = unsigned char;
+  static constexpr PageState kIncoreMask = 1;
 #endif
   EXPECT_EQ(0u, size % 4096);
   const size_t num_pages = size / 4096;
@@ -47,7 +49,7 @@
     return false;
   EXPECT_EQ(0, res);
   for (size_t i = 0; i < num_pages; i++) {
-    if (!page_states[i])
+    if (!(page_states[i] & kIncoreMask))
       return false;
   }
   return true;