ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "LibNativeHelper: No bind mount on mac"

Browse source
This commit is contained in:
Andreas Gampe 2014-09-24 23:40:28 +00:00 • committed by Gerrit Code Review
commit 13f00594f8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnativebridge/native_bridge.cc
View file

@ -218,6 +218,7 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct
app_data_dir = new char[len]; app_data_dir = new char[len];
strncpy(app_data_dir, app_data_dir_in, len); strncpy(app_data_dir, app_data_dir_in, len);
#ifndef __APPLE__
if (instruction_set == nullptr) { if (instruction_set == nullptr) {
return; 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) { 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); 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) { static void SetCpuAbi(JNIEnv* env, jclass build_class, const char* field, const char* value) {