Do not use -DUSE_*MALLOC for host build

When we use ninja and switch a lunch target to another, they
may cause unnecessary rebuild because ninja detects command
line changes. They are used in #ifdef HAVE_ANDROID_OS so there
should be no semantics changes.

Change-Id: I629c94c872c8fc8ba4b4c59b565338e14570c3fe

diff --git a/runtime/Android.mk b/runtime/Android.mk
index fe79e72..013e3f7 100644 (file)
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -340,10 +340,13 @@ LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \
 
 LIBART_CFLAGS := -DBUILDING_LIBART=1
 
+LIBART_TARGET_CFLAGS :=
+LIBART_HOST_CFLAGS :=
+
 ifeq ($(MALLOC_IMPL),dlmalloc)
-  LIBART_CFLAGS += -DUSE_DLMALLOC
+  LIBART_TARGET_CFLAGS += -DUSE_DLMALLOC
 else
-  LIBART_CFLAGS += -DUSE_JEMALLOC
+  LIBART_TARGET_CFLAGS += -DUSE_JEMALLOC
 endif
 
 # Default dex2oat instruction set features.
@@ -439,8 +442,10 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT
   LOCAL_CFLAGS := $$(LIBART_CFLAGS)
   LOCAL_LDFLAGS := $$(LIBART_LDFLAGS)
   ifeq ($$(art_target_or_host),target)
+    LOCAL_CFLAGS += $$(LIBART_TARGET_CFLAGS)
     LOCAL_LDFLAGS += $$(LIBART_TARGET_LDFLAGS)
   else #host
+    LOCAL_CFLAGS += $$(LIBART_HOST_CFLAGS)
     LOCAL_LDFLAGS += $$(LIBART_HOST_LDFLAGS)
     ifeq ($$(art_static_or_shared),static)
       LOCAL_LDFLAGS += -static
@@ -580,4 +585,6 @@ LIBART_HOST_SRC_FILES_32 :=
 LIBART_HOST_SRC_FILES_64 :=
 LIBART_ENUM_OPERATOR_OUT_HEADER_FILES :=
 LIBART_CFLAGS :=
+LIBART_TARGET_CFLAGS :=
+LIBART_HOST_CFLAGS :=
 build-libart :=