diff options
| author | Ian Rogers <irogers@google.com> | 2014-09-25 03:55:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 03:55:47 +0000 |
| commit | fee8ffb8dacc7f3c18f1976af39c51a24eb206d6 (patch) | |
| tree | d354a1701837abe228754050048087458d55fbdc | |
| parent | aa60a911d005d214263224d880bb2f78906dcd4e (diff) | |
| parent | 8a65899e8a58047c1a29e243719ec25bf59a3448 (diff) | |
| download | system_core-fee8ffb8dacc7f3c18f1976af39c51a24eb206d6.zip system_core-fee8ffb8dacc7f3c18f1976af39c51a24eb206d6.tar.gz system_core-fee8ffb8dacc7f3c18f1976af39c51a24eb206d6.tar.bz2 | |
am 8a65899e: am f502b384: Merge "LibNativeBridge: Fix mac build warning"
* commit '8a65899e8a58047c1a29e243719ec25bf59a3448':
LibNativeBridge: Fix mac build warning
| -rw-r--r-- | libnativebridge/native_bridge.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index 11f330c..617f776 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -208,6 +208,10 @@ bool NeedsNativeBridge(const char* instruction_set) { 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) { if (app_data_dir_in == nullptr) { 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); } #else + UNUSED(instruction_set); ALOGW("Mac OS does not support bind-mounting. Host simulation of native bridge impossible."); #endif } |