diff options
Diffstat (limited to 'libutils/Android.mk')
| -rw-r--r-- | libutils/Android.mk | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 035846b..63a8d70 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -14,9 +14,6 @@ LOCAL_PATH:= $(call my-dir) -# libutils is a little unique: It's built twice, once for the host -# and once for the device. - commonSources:= \ BasicHashtable.cpp \ BlobCache.cpp \ @@ -42,7 +39,7 @@ commonSources:= \ Tokenizer.cpp \ Unicode.cpp \ VectorImpl.cpp \ - misc.cpp + misc.cpp \ host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -Werror @@ -53,13 +50,6 @@ host_commonCflags += -DMB_CUR_MAX=1 endif endif -host_commonLdlibs := - -ifeq ($(TARGET_OS),linux) -host_commonLdlibs += -lrt -ldl -endif - - # For the host # ===================================================== include $(CLEAR_VARS) @@ -67,6 +57,9 @@ 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) @@ -91,10 +84,6 @@ LOCAL_CFLAGS += -DALIGN_DOUBLE endif LOCAL_CFLAGS += -Werror -LOCAL_C_INCLUDES += \ - bionic/libc \ - external/zlib - LOCAL_STATIC_LIBRARIES := \ libcutils @@ -103,8 +92,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libdl -include external/stlport/libstlport.mk - LOCAL_MODULE:= libutils LOCAL_C_INCLUDES += external/safe-iop/include include $(BUILD_STATIC_LIBRARY) @@ -122,8 +109,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_CFLAGS := -Werror LOCAL_C_INCLUDES += external/safe-iop/include -include external/stlport/libstlport.mk - include $(BUILD_SHARED_LIBRARY) # Include subdirectory makefiles @@ -142,8 +127,5 @@ LOCAL_SHARED_LIBRARIES := liblog LOCAL_SRC_FILES := SharedBufferTest.cpp include $(BUILD_HOST_NATIVE_TEST) -# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework -# team really wants is to build the stuff defined by this makefile. -ifeq (,$(ONE_SHOT_MAKEFILE)) +# Build the tests in the tests/ subdirectory. include $(call first-makefiles-under,$(LOCAL_PATH)) -endif |