diff options
Diffstat (limited to 'dex2oat')
-rw-r--r-- | dex2oat/Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 7bcf762daf..5cfab51d66 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -28,10 +28,12 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,target,debug)) endif -# 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),libart-compiler,art/compiler,host,ndebug)) -endif -ifeq ($(ART_BUILD_NDEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug)) +ifeq ($(WITH_HOST_DALVIK),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),libart-compiler,art/compiler,host,ndebug)) + endif + ifeq ($(ART_BUILD_NDEBUG),true) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug)) + endif endif |