diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-29 02:09:33 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-06-04 08:00:30 -0700 |
| commit | 5ca4eaace8ba513f97309bbdc2e156de4b1d648a (patch) | |
| tree | 3a392eb39fda9b6f6e46e05e529c85e18296bc49 /disassembler | |
| parent | fa5fda3ca52678b6fa739aad46e5c6ea08ae301e (diff) | |
| download | android_art-5ca4eaace8ba513f97309bbdc2e156de4b1d648a.tar.gz android_art-5ca4eaace8ba513f97309bbdc2e156de4b1d648a.tar.bz2 android_art-5ca4eaace8ba513f97309bbdc2e156de4b1d648a.zip | |
ART: Make LOCAL_CLANG architecture dependent for the target
Be selective for which target we compile with Clang. Currently we
only want to compile with Clang for ARM64, which means we need to
be careful about ARM, which is the second architecture for that.
Bug: 15014252
(cherry picked from commit 9689e3768621130b2536564f4e00fcb6b3d25df4)
Change-Id: I312e1caea08f2f3a20304b27f979d3c7b72b0a04
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 814323cda2..b4b194dec1 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -59,27 +59,22 @@ define build-libart-disassembler LOCAL_SRC_FILES := $$(LIBART_DISASSEMBLER_SRC_FILES) ifeq ($$(art_target_or_host),target) - LOCAL_CLANG := $(ART_TARGET_CLANG) - LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) + $(call set-target-local-clang-vars) + $(call set-target-local-cflags-vars,$(2)) else # host LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS += $(ART_HOST_CFLAGS) + ifeq ($$(art_ndebug_or_debug),debug) + LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS) + else + LOCAL_CFLAGS += $(ART_HOST_NON_DEBUG_CFLAGS) + endif endif LOCAL_SHARED_LIBRARIES += liblog ifeq ($$(art_ndebug_or_debug),debug) - ifeq ($$(art_target_or_host),target) - LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS) - else # host - LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS) - endif LOCAL_SHARED_LIBRARIES += libartd else - ifeq ($$(art_target_or_host),target) - LOCAL_CFLAGS += $(ART_TARGET_NON_DEBUG_CFLAGS) - else # host - LOCAL_CFLAGS += $(ART_HOST_NON_DEBUG_CFLAGS) - endif LOCAL_SHARED_LIBRARIES += libart endif |