commit a20445eb402154a0d9b32680e5fa24ac99ebe038
author Andreas Gampe <agampe@google.com> Thu Sep 25 00:06:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 25 00:06:18 2014 +0000
tree a81e8fbf71213d97de5fe58179740ecffbd97ab6
parent 050c7e05db2cc9194136a66651c4dce2a73b016b
parent b79956b2a0cbaba8ecc420053b2e36fb981a2f4f

am b79956b2: am 44f20f70: am 13f00594: Merge "LibNativeHelper: No bind mount on mac"

* commit 'b79956b2a0cbaba8ecc420053b2e36fb981a2f4f':
  LibNativeHelper: No bind mount on mac

libnativebridge/native_bridge.cc

diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index 8c0aa84..11f330c 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -218,6 +218,7 @@
   app_data_dir = new char[len];
   strncpy(app_data_dir, app_data_dir_in, len);
 
+#ifndef __APPLE__
   if (instruction_set == nullptr) {
     return;
   }
@@ -244,6 +245,9 @@
   if (TEMP_FAILURE_RETRY(mount("/proc/cpuinfo", cpuinfo_path, nullptr, MS_BIND, nullptr)) == -1) {
     ALOGW("Failed to bind-mount %s as /proc/cpuinfo: %d", cpuinfo_path, errno);
   }
+#else
+  ALOGW("Mac OS does not support bind-mounting. Host simulation of native bridge impossible.");
+#endif
 }
 
 static void SetCpuAbi(JNIEnv* env, jclass build_class, const char* field, const char* value) {