tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add liblog" into jb-mr2-dev

Browse source
This commit is contained in:
Ying Wang 2013-04-10 05:12:00 +00:00 committed by Android (Google) Code Review
commit 134ec88c94
2 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/binary.mk
View file

@ -66,32 +66,6 @@ else
endif
endif
# Logging used to be part of libcutils (target) and libutils (sim);
# hack modules that use those other libs to also include liblog.
# All of this complexity is to make sure that liblog only appears
# once, and appears just before libcutils or libutils on the link
# line.
# TODO: remove this hack and change all modules to use liblog
# when necessary.
define insert-liblog
$(if $(filter liblog,$(1)),$(1), \
$(if $(filter libcutils,$(1)), \
$(patsubst libcutils,liblog libcutils,$(1)) \
, \
$(patsubst libutils,liblog libutils,$(1)) \
) \
)
endef
ifneq (,$(filter libcutils libutils,$(LOCAL_SHARED_LIBRARIES)))
LOCAL_SHARED_LIBRARIES := $(call insert-liblog,$(LOCAL_SHARED_LIBRARIES))
endif
ifneq (,$(filter libcutils libutils,$(LOCAL_STATIC_LIBRARIES)))
LOCAL_STATIC_LIBRARIES := $(call insert-liblog,$(LOCAL_STATIC_LIBRARIES))
endif
ifneq (,$(filter libcutils libutils,$(LOCAL_WHOLE_STATIC_LIBRARIES)))
LOCAL_WHOLE_STATIC_LIBRARIES := $(call insert-liblog,$(LOCAL_WHOLE_STATIC_LIBRARIES))
endif
ifdef LOCAL_SDK_VERSION
# Get the list of INSTALLED libraries as module names.
# We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for

4
tools/zipalign/Android.mk
View file

@ -16,7 +16,8 @@ LOCAL_C_INCLUDES += external/zlib
LOCAL_STATIC_LIBRARIES := \
libutils \
libcutils
libcutils \
liblog
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt
@ -35,4 +36,3 @@ endif # BUILD_HOST_static
LOCAL_MODULE := zipalign
include $(BUILD_HOST_EXECUTABLE)