commit ee0ebc81ba294710f90f0c8c934db1debae437aa
author Andreas Gampe <agampe@google.com> Tue Oct 21 21:07:28 2014 -0700
committer Andreas Gampe <agampe@google.com> Tue Oct 21 22:38:30 2014 -0700
tree 66e7bdfa380e6d8f1b56aadec90cb117efad68af
parent 4918e1ca05d0ec1510c7e997c5ae94cf6ce52045

ART: Fix common_build CFLAGS

Actually use the additional art_clang_cflags.

Change-Id: I2b5c5dacfdbffaa9b9c1e7a6fdb8ad79d8536fe8

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 0e930ee..478c63c 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -102,6 +102,9 @@
   -include $(LLVM_ROOT_PATH)/llvm.mk
 endif
 
+ART_HOST_CFLAGS :=
+ART_TARGET_CFLAGS :=
+
 # Clang build support.
 
 # Host.
@@ -226,13 +229,13 @@
 ifndef LIBART_IMG_HOST_BASE_ADDRESS
   $(error LIBART_IMG_HOST_BASE_ADDRESS unset)
 endif
-ART_HOST_CFLAGS := $(art_cflags) -DANDROID_SMP=1 -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS)
+ART_HOST_CFLAGS += $(art_cflags) -DANDROID_SMP=1 -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS)
 ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default
 
 ifndef LIBART_IMG_TARGET_BASE_ADDRESS
   $(error LIBART_IMG_TARGET_BASE_ADDRESS unset)
 endif
-ART_TARGET_CFLAGS := $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS)
+ART_TARGET_CFLAGS += $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS)
 
 ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags)
 ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags)