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

am 9f93e297: Merge "LibNativeBridge: Fix two bugs"

Browse source 
* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
  LibNativeBridge: Fix two bugs
This commit is contained in:
Andreas Gampe 2014-09-26 04:59:17 +00:00 • committed by Android Git Automerger
commit 2d687fe3d8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnativebridge/native_bridge.cc
View file

@ -205,7 +205,7 @@ static const char* kRuntimeISA = "unknown";
bool NeedsNativeBridge(const char* instruction_set) { bool NeedsNativeBridge(const char* instruction_set) {
return strncmp(instruction_set, kRuntimeISA, strlen(kRuntimeISA)) != 0; return strncmp(instruction_set, kRuntimeISA, strlen(kRuntimeISA) + 1) != 0;
} }
#ifdef __APPLE__ #ifdef __APPLE__
@ -231,7 +231,8 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct
// 10 is a loose upper bound on the currently known instruction sets (a tight bound is 7 for // 10 is a loose upper bound on the currently known instruction sets (a tight bound is 7 for
// x86_64 [including the trailing \0]). This is so we don't have to change here if there will // x86_64 [including the trailing \0]). This is so we don't have to change here if there will
// be another instruction set in the future. // be another instruction set in the future.
ALOGW("Instruction set %s is malformed, must be less than 10 characters.", instruction_set); ALOGW("Instruction set %s is malformed, must be less than or equal to 10 characters.",
instruction_set);
return; return;
} }
@ -246,7 +247,11 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct
"/%s/cpuinfo", instruction_set); "/%s/cpuinfo", instruction_set);
// Bind-mount. // Bind-mount.
if (TEMP_FAILURE_RETRY(mount("/proc/cpuinfo", cpuinfo_path, nullptr, MS_BIND, nullptr)) == -1) { if (TEMP_FAILURE_RETRY(mount(cpuinfo_path, // Source.
"/proc/cpuinfo", // Target.
nullptr, // FS type.
MS_BIND, // Mount flags: bind mount.
nullptr)) == -1) { // "Data."
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 #else