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

am f502b384: Merge "LibNativeBridge: Fix mac build warning"

Browse source 
* commit 'f502b3842739503e9f09675fc02787b8982dc58f':
  LibNativeBridge: Fix mac build warning
This commit is contained in:
Ian Rogers 2014-09-25 03:50:07 +00:00 • committed by Android Git Automerger
commit 8a65899e8a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnativebridge/native_bridge.cc
View file

@ -208,6 +208,10 @@ bool NeedsNativeBridge(const char* instruction_set) {
return strncmp(instruction_set, kRuntimeISA, strlen(kRuntimeISA)) != 0; return strncmp(instruction_set, kRuntimeISA, strlen(kRuntimeISA)) != 0;
} }
#ifdef __APPLE__
template<typename T> void UNUSED(const T&) {}
#endif
void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruction_set) { void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruction_set) {
if (app_data_dir_in == nullptr) { if (app_data_dir_in == nullptr) {
return; return;
@ -246,6 +250,7 @@ void PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct
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
UNUSED(instruction_set);
ALOGW("Mac OS does not support bind-mounting. Host simulation of native bridge impossible."); ALOGW("Mac OS does not support bind-mounting. Host simulation of native bridge impossible.");
#endif #endif
} }