diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:32 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:32 -0700 |
| commit | 29e1e7393d1742f9dd5663c63026f50981e5bd89 (patch) | |
| tree | 0baf9441d44fce10821ec9bf1f32655e5695a8aa /liblog | |
| parent | 56286d6fdb07d8b1310c27eeb59bdf05500f166e (diff) | |
| download | system_core-29e1e7393d1742f9dd5663c63026f50981e5bd89.zip system_core-29e1e7393d1742f9dd5663c63026f50981e5bd89.tar.gz system_core-29e1e7393d1742f9dd5663c63026f50981e5bd89.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/Android.mk | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk index 0eec87f..bd4fed4 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -48,25 +48,14 @@ LOCAL_LDLIBS := -lpthread LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 include $(BUILD_HOST_STATIC_LIBRARY) -ifeq ($(TARGET_SIMULATOR),true) - # Shared library for simulator - # ======================================================== - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_SRC_FILES := $(liblog_host_sources) - LOCAL_LDLIBS := -lpthread - LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 - include $(BUILD_SHARED_LIBRARY) -else # !sim - # Shared and static library for target - # ======================================================== - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_SRC_FILES := $(liblog_sources) - include $(BUILD_STATIC_LIBRARY) +# Shared and static library for target +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := liblog +LOCAL_SRC_FILES := $(liblog_sources) +include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_WHOLE_STATIC_LIBRARIES := liblog - include $(BUILD_SHARED_LIBRARY) -endif # !sim +include $(CLEAR_VARS) +LOCAL_MODULE := liblog +LOCAL_WHOLE_STATIC_LIBRARIES := liblog +include $(BUILD_SHARED_LIBRARY) |