From a3a06feeeddfbd81f528bc6632a14032516d5a63 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 26 Sep 2017 20:26:11 -0700
Subject: [PATCH] Add -lm to the default libs for Linux & Darwin

libm is a default library for device builds, so default it for host
builds as well.

Also removes duplicate additions of -ldl, -lpthread, -lm and -lrt.

Test: m host
Change-Id: I6a07e12053090eb6997b79d4091c28ac9a9022de
---
 core/binary.mk                | 4 ++--
 core/config_sanitizers.mk     | 2 --
 core/cxx_stl_setup.mk         | 1 -
 core/host_test_internal.mk    | 2 --
 tools/makeparallel/Android.bp | 5 -----
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/core/binary.mk b/core/binary.mk
index 6a58c6c6c9..2c715eaed5 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -291,10 +291,10 @@ my_ldlib_flags :=
 my_shared_libraries += $(patsubst -l%,lib%,$(filter-out $(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
+  # Add -ldl, -lpthread, -lm and -lrt to host builds to match the default behavior of
   # device builds
   ifneq ($($(my_prefix)OS),windows)
-    my_ldlibs += -ldl -lpthread
+    my_ldlibs += -ldl -lpthread -lm
     ifneq ($(HOST_OS),darwin)
       my_ldlibs += -lrt
     endif
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index e02f03a257..e01fbbf756 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -217,7 +217,6 @@ ifneq ($(my_sanitize),)
   ifdef LOCAL_IS_HOST_MODULE
     my_cflags += -fno-sanitize-recover=all
     my_ldflags += -fsanitize=$(fsanitize_arg)
-    my_ldlibs += -lrt -ldl
   else
     my_cflags += -fsanitize-trap=all
     my_cflags += -ftrap-function=abort
@@ -249,7 +248,6 @@ ifneq ($(filter address,$(my_global_sanitize) $(my_sanitize)),)
   ifdef LOCAL_IS_HOST_MODULE
     # -nodefaultlibs (provided with libc++) prevents the driver from linking
     # libraries needed with -fsanitize=address. http://b/18650275 (WAI)
-    my_ldlibs += -lm -lpthread
     my_ldflags += -Wl,--no-as-needed
   else
     # Add asan libraries unless LOCAL_MODULE is the asan library.
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 0baec26e17..f07659d4fd 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -89,7 +89,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
     ifdef LOCAL_IS_HOST_MODULE
         my_cppflags += -nostdinc++
         my_ldflags += -nodefaultlibs
-        my_ldlibs += -lpthread -lm
         my_cxx_ldlibs += $($($(my_prefix)OS)_$(my_link_type)_gcclibs)
     else
         ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk
index ffb22c71f7..42e01e1e4e 100644
--- a/core/host_test_internal.mk
+++ b/core/host_test_internal.mk
@@ -5,9 +5,7 @@
 ifeq ($(LOCAL_GTEST),true)
   LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS
   LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX
-  LOCAL_LDLIBS_linux += -lpthread
   LOCAL_CFLAGS_darwin += -DGTEST_OS_MAC
-  LOCAL_LDLIBS_darwin += -lpthread
 
   LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
 
diff --git a/tools/makeparallel/Android.bp b/tools/makeparallel/Android.bp
index cb818177ae..898db68610 100644
--- a/tools/makeparallel/Android.bp
+++ b/tools/makeparallel/Android.bp
@@ -18,9 +18,4 @@ cc_binary_host {
         "makeparallel.cpp",
     ],
     cflags: ["-Wall", "-Werror"],
-    target: {
-        linux: {
-            host_ldlibs: ["-lrt", "-lpthread"],
-        },
-    },
 }