diff options
Diffstat (limited to 'libs/utils/Android.mk')
| -rw-r--r-- | libs/utils/Android.mk | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index cbfe7bd..42e1c7e 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -20,9 +20,7 @@ LOCAL_PATH:= $(call my-dir) commonSources:= \ BasicHashtable.cpp \ BlobCache.cpp \ - BufferedTextOutput.cpp \ CallStack.cpp \ - Debug.cpp \ FileMap.cpp \ Flattenable.cpp \ JenkinsHash.cpp \ @@ -36,18 +34,12 @@ commonSources:= \ StopWatch.cpp \ String8.cpp \ String16.cpp \ - StringArray.cpp \ SystemClock.cpp \ - TextOutput.cpp \ Threads.cpp \ Timers.cpp \ Tokenizer.cpp \ Unicode.cpp \ VectorImpl.cpp \ - WorkQueue.cpp \ - ZipFileCRO.cpp \ - ZipFileRO.cpp \ - ZipUtils.cpp \ misc.cpp host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) @@ -74,9 +66,6 @@ ifeq ($(HOST_OS), linux) LOCAL_SRC_FILES += Looper.cpp endif LOCAL_MODULE:= libutils -LOCAL_STATIC_LIBRARIES := libz -LOCAL_C_INCLUDES := \ - external/zlib LOCAL_CFLAGS += $(host_commonCflags) LOCAL_LDLIBS += $(host_commonLdlibs) include $(BUILD_HOST_STATIC_LIBRARY) @@ -90,15 +79,12 @@ ifeq ($(HOST_OS), linux) LOCAL_SRC_FILES += Looper.cpp endif LOCAL_MODULE:= lib64utils -LOCAL_STATIC_LIBRARIES := libz -LOCAL_C_INCLUDES := \ - external/zlib LOCAL_CFLAGS += $(host_commonCflags) -m64 LOCAL_LDLIBS += $(host_commonLdlibs) include $(BUILD_HOST_STATIC_LIBRARY) -# For the device +# For the device, static # ===================================================== include $(CLEAR_VARS) @@ -123,14 +109,28 @@ LOCAL_C_INCLUDES += \ LOCAL_LDLIBS += -lpthread +LOCAL_STATIC_LIBRARIES := \ + libcutils + LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libcorkscrew \ - libz + libcorkscrew \ + liblog \ + libdl LOCAL_MODULE:= libutils +include $(BUILD_STATIC_LIBRARY) + +# For the device, shared +# ===================================================== +include $(CLEAR_VARS) +LOCAL_MODULE:= libutils +LOCAL_WHOLE_STATIC_LIBRARIES := libutils +LOCAL_SHARED_LIBRARIES := \ + liblog \ + libcutils \ + libdl \ + libcorkscrew + include $(BUILD_SHARED_LIBRARY) # Include subdirectory makefiles |