commit cb34698f42ed688ec98bf3c9562075237ee72490
author Shinichiro Hamaji <hamaji@google.com> Fri Jul 31 06:03:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 31 06:03:10 2015 +0000
tree 020868a77c125dace4d8c7001f33898f8490d2a0
parent 8e568d079b052db118d83e6e89ea36ab4fa4bfb1
parent 028aec203da206f9996f01432474165e801cd328

Merge "Do not use -DUSE_*MALLOC for host build"

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 4a944963..ce3e6d1 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -341,10 +341,13 @@
 
 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.
@@ -440,8 +443,10 @@
   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
@@ -581,4 +586,6 @@
 LIBART_HOST_SRC_FILES_64 :=
 LIBART_ENUM_OPERATOR_OUT_HEADER_FILES :=
 LIBART_CFLAGS :=
+LIBART_TARGET_CFLAGS :=
+LIBART_HOST_CFLAGS :=
 build-libart :=