diff options
| author | Andreas Gampe <agampe@google.com> | 2014-09-24 23:40:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-24 23:40:28 +0000 |
| commit | 13f00594f89721cee6cd983a190b8da141e1a34b (patch) | |
| tree | 6baec067099f62266778b5adc232a77d673e3e20 | |
| parent | 9d1b922725822a7017318f738f67831a994c8fdf (diff) | |
| parent | 962eb40abb68eb60077da158755b6a09c306aa41 (diff) | |
| download | system_core-13f00594f89721cee6cd983a190b8da141e1a34b.zip system_core-13f00594f89721cee6cd983a190b8da141e1a34b.tar.gz system_core-13f00594f89721cee6cd983a190b8da141e1a34b.tar.bz2 | |
Merge "LibNativeHelper: No bind mount on mac"
| -rw-r--r-- | libnativebridge/native_bridge.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct 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 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct 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) { |