diff options
Diffstat (limited to 'libutils/Android.mk')
| -rw-r--r-- | libutils/Android.mk | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 1710d36..e738c15 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -26,6 +26,7 @@ commonSources:= \ LinearAllocator.cpp \ LinearTransform.cpp \ Log.cpp \ + NativeHandle.cpp \ Printer.cpp \ ProcessCallStack.cpp \ PropertyMap.cpp \ @@ -43,7 +44,7 @@ commonSources:= \ VectorImpl.cpp \ misc.cpp -host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) +host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -Werror ifeq ($(HOST_OS),windows) ifeq ($(strip $(USE_CYGWIN),),) @@ -66,24 +67,13 @@ LOCAL_SRC_FILES:= $(commonSources) ifeq ($(HOST_OS), linux) LOCAL_SRC_FILES += Looper.cpp endif +ifeq ($(HOST_OS),darwin) +LOCAL_CFLAGS += -Wno-unused-parameter +endif LOCAL_MODULE:= libutils LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(host_commonCflags) -LOCAL_LDLIBS += $(host_commonLdlibs) -include $(BUILD_HOST_STATIC_LIBRARY) - - -# For the host, 64-bit -# ===================================================== -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= $(commonSources) -ifeq ($(HOST_OS), linux) -LOCAL_SRC_FILES += Looper.cpp -endif -LOCAL_MODULE:= lib64utils -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CFLAGS += $(host_commonCflags) -m64 -LOCAL_LDLIBS += $(host_commonLdlibs) +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -98,19 +88,13 @@ LOCAL_SRC_FILES:= \ Looper.cpp \ Trace.cpp -ifeq ($(TARGET_OS),linux) -LOCAL_LDLIBS += -lrt -ldl -endif - ifeq ($(TARGET_ARCH),mips) LOCAL_CFLAGS += -DALIGN_DOUBLE endif +LOCAL_CFLAGS += -Werror LOCAL_C_INCLUDES += \ - bionic/libc/private \ - external/zlib - -LOCAL_LDLIBS += -lpthread + external/zlib LOCAL_STATIC_LIBRARIES := \ libcutils @@ -120,8 +104,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libdl -include external/stlport/libstlport.mk - LOCAL_MODULE:= libutils include $(BUILD_STATIC_LIBRARY) @@ -134,9 +116,8 @@ LOCAL_SHARED_LIBRARIES := \ libbacktrace \ libcutils \ libdl \ - liblog \ - -include external/stlport/libstlport.mk + liblog +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) |