diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-18 11:26:51 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-01-18 22:56:17 -0800 |
| commit | 4e3b284b2babf813c26ad9afb129f57e3d88f67d (patch) | |
| tree | 192dab3320cc06b43d8967983a755711f0287c12 /compiler/Android.mk | |
| parent | ed31badc6de501320f49bec679dcdf9214ac07cc (diff) | |
| download | art-4e3b284b2babf813c26ad9afb129f57e3d88f67d.tar.gz art-4e3b284b2babf813c26ad9afb129f57e3d88f67d.tar.bz2 art-4e3b284b2babf813c26ad9afb129f57e3d88f67d.zip | |
Update ElfWriterMclinker for klp
(cherry picked from commit a6263af9aea65c65744bdd845fed68c4814e9514)
Change-Id: I3eb9fee8afb1ef12aae4c87770882afee637971d
Diffstat (limited to 'compiler/Android.mk')
| -rw-r--r-- | compiler/Android.mk | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index 4340929e9b..25dfb0a192 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -196,6 +196,34 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libLLVM ifeq ($(ART_USE_PORTABLE_COMPILER),true) LOCAL_CFLAGS += -DART_USE_PORTABLE_COMPILER=1 + ifeq ($$(art_target_or_host),target) + ifeq ($(TARGET_ARCH),arm) + LOCAL_STATIC_LIBRARIES += libmcldARMInfo libmcldARMTarget + else # TARGET_ARCH != arm + ifeq ($(TARGET_ARCH),x86) + LOCAL_STATIC_LIBRARIES += libmcldX86Info libmcldX86Target + else # TARGET_ARCH != x86 + ifeq ($(TARGET_ARCH),x86_64) + LOCAL_STATIC_LIBRARIES += libmcldX86Info libmcldX86Target + else # TARGET_ARCH != x86_64 + ifeq ($(TARGET_ARCH),mips) + LOCAL_STATIC_LIBRARIES += libmcldMipsInfo libmcldMipsTarget + else # TARGET_ARCH != mips + ifeq ($(TARGET_ARCH),aarch64) + $$(info TODOAArch64: $$(LOCAL_PATH)/Android.mk Add AArch64 specific MCLinker libraries) + else # TARGET_ARCH != aarch64 + $$(error unsupported TARGET_ARCH=$(TARGET_ARCH)) + endif # TARGET_ARCH != aarch64 + endif # TARGET_ARCH != mips + endif # TARGET_ARCH != x86_64 + endif # TARGET_ARCH != x86 + endif # TARGET_ARCH != arm + else # host + LOCAL_STATIC_LIBRARIES += libmcldARMInfo libmcldARMTarget + LOCAL_STATIC_LIBRARIES += libmcldX86Info libmcldX86Target + LOCAL_STATIC_LIBRARIES += libmcldMipsInfo libmcldMipsTarget + endif + LOCAL_STATIC_LIBRARIES += libmcldCore libmcldObject libmcldADT libmcldFragment libmcldTarget libmcldCodeGen libmcldLDVariant libmcldMC libmcldSupport libmcldLD endif LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime |