Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161
am: ec6ba0d686
Change-Id: I2fe15e8e13e118a2c4a0c507158f8f847f1e250e
This commit is contained in:
commit
380d3af42f
|
@ -290,6 +290,15 @@ my_ldlib_flags :=
|
||||||
# Move other ldlibs back to shared libraries
|
# Move other ldlibs back to shared libraries
|
||||||
my_shared_libraries += $(patsubst -l%,lib%,$(filter-out $(my_allowed_ldlibs),$(my_ldlibs)))
|
my_shared_libraries += $(patsubst -l%,lib%,$(filter-out $(my_allowed_ldlibs),$(my_ldlibs)))
|
||||||
my_ldlibs := $(filter $(my_allowed_ldlibs),$(my_ldlibs))
|
my_ldlibs := $(filter $(my_allowed_ldlibs),$(my_ldlibs))
|
||||||
|
else # LOCAL_IS_HOST_MODULE
|
||||||
|
# Add -ldl, -lpthread and -lrt to host builds to match the default behavior of
|
||||||
|
# device builds
|
||||||
|
ifneq ($($(my_prefix)OS),windows)
|
||||||
|
my_ldlibs += -ldl -lpthread
|
||||||
|
ifneq ($(HOST_OS),darwin)
|
||||||
|
my_ldlibs += -lrt
|
||||||
|
endif
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(LOCAL_SDK_VERSION),)
|
ifneq ($(LOCAL_SDK_VERSION),)
|
||||||
|
|
Loading…
Reference in New Issue