diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-01-30 14:08:26 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-03-06 14:08:46 -0800 |
| commit | 265091e581c9f643b37e7966890911f09e223269 (patch) | |
| tree | ae493ce6c3537aebc3a85f59a73500fa819a7baf /build/Android.executable.mk | |
| parent | 4c1c283a7410784e9cab309f868248690b788a9c (diff) | |
| download | art-265091e581c9f643b37e7966890911f09e223269.zip art-265091e581c9f643b37e7966890911f09e223269.tar.gz art-265091e581c9f643b37e7966890911f09e223269.tar.bz2 | |
Remove ExtractCodeAndPrelink and switch Portable to MCLinker
Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2
Diffstat (limited to 'build/Android.executable.mk')
| -rw-r--r-- | build/Android.executable.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 730c980..afb335e 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -112,13 +112,20 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),target,debug)) $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,debug)) endif -ifeq ($(ART_BUILD_HOST_NDEBUG),true) + +# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target. +ifeq ($(ART_BUILD_NDEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,ndebug)) +endif +ifeq ($(ART_BUILD_NDEBUG),true) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,debug)) +endif + +ifeq ($(ART_BUILD_HOST_NDEBUG),true) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,ndebug)) $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,ndebug)) endif ifeq ($(ART_BUILD_HOST_DEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,debug)) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,debug)) $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,debug)) endif |