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

am 43d5f927: am 76365787: Get rid of the liblog hack.

Browse source 
* commit '43d5f927c1c8f7f1a7fad431560044565b5415b9':
  Get rid of the liblog hack.
This commit is contained in:
Ying Wang 2013-04-10 10:13:08 -07:00 committed by Android Git Automerger
commit c8b5d4b207
1 changed files with 0 additions and 26 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
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 ifdef LOCAL_SDK_VERSION
# Get the list of INSTALLED libraries as module names. # Get the list of INSTALLED libraries as module names.
# We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for # We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for