am 4aa9da3f: Merge "Build fix."
* commit '4aa9da3f32d8e97968f4a627e03f7fcf041270a7':
Build fix.
diff --git a/NativeCode.mk b/NativeCode.mk
index 5e149fd..d811439 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -118,7 +118,7 @@
LOCAL_CFLAGS += $(core_cflags)
LOCAL_C_INCLUDES += $(core_c_includes)
LOCAL_CPPFLAGS += $(core_cppflags)
-LOCAL_LDLIBS += -ldl -lpthread
+LOCAL_LDLIBS += -ldl -lpthread -lrt
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjavacore
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
diff --git a/luni/src/main/native/libcore_io_Posix.cpp b/luni/src/main/native/libcore_io_Posix.cpp
index aee3933..d763c9e 100644
--- a/luni/src/main/native/libcore_io_Posix.cpp
+++ b/luni/src/main/native/libcore_io_Posix.cpp
@@ -61,6 +61,8 @@
#include <termios.h>
#include <unistd.h>
+#define __unused __attribute__((__unused__))
+
#define TO_JAVA_STRING(NAME, EXP) \
jstring NAME = env->NewStringUTF(EXP); \
if (NAME == NULL) return NULL;