diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-11 19:26:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:26:16 +0000 |
| commit | 07faf03b116fc5ce7b03a4f5404b20f54da73540 (patch) | |
| tree | 893e83ce1019a94d241d652cd851432eb7580f2e | |
| parent | e47efca0c45d284f372c5e5618c3b51bf2a07e29 (diff) | |
| parent | cc6d37df1373291d98718f7c93dbb5cd65d4c0bb (diff) | |
| download | libcore-07faf03b116fc5ce7b03a4f5404b20f54da73540.zip libcore-07faf03b116fc5ce7b03a4f5404b20f54da73540.tar.gz libcore-07faf03b116fc5ce7b03a4f5404b20f54da73540.tar.bz2 | |
am cc6d37df: am 4aa9da3f: Merge "Build fix."
* commit 'cc6d37df1373291d98718f7c93dbb5cd65d4c0bb':
Build fix.
| -rw-r--r-- | NativeCode.mk | 2 | ||||
| -rw-r--r-- | luni/src/main/native/libcore_io_Posix.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 63e26c8..bfd7bcf 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -118,7 +118,7 @@ LOCAL_SRC_FILES += $(core_src_files) 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 8ae21e9..e4a878a 100644 --- a/luni/src/main/native/libcore_io_Posix.cpp +++ b/luni/src/main/native/libcore_io_Posix.cpp @@ -62,6 +62,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; |