diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-22 05:43:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-22 05:43:58 +0000 |
| commit | 94e5af8602150efa95bde35cc9be9891ddf30135 (patch) | |
| tree | 50c6958bd5dc87595e1a3acf8a61a87985bd6496 | |
| parent | 71c4cea525eb6a84d0763a42d241f50c9c2ac8d2 (diff) | |
| parent | ee0ebc81ba294710f90f0c8c934db1debae437aa (diff) | |
| download | art-94e5af8602150efa95bde35cc9be9891ddf30135.tar.gz art-94e5af8602150efa95bde35cc9be9891ddf30135.tar.bz2 art-94e5af8602150efa95bde35cc9be9891ddf30135.zip | |
Merge "ART: Fix common_build CFLAGS"
| -rw-r--r-- | build/Android.common_build.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 0e930ee207..478c63c9a5 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -102,6 +102,9 @@ ifeq ($(ART_USE_PORTABLE_COMPILER),true) -include $(LLVM_ROOT_PATH)/llvm.mk endif +ART_HOST_CFLAGS := +ART_TARGET_CFLAGS := + # Clang build support. # Host. @@ -226,13 +229,13 @@ endif 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) |