diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-23 14:21:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-23 14:21:45 -0700 |
| commit | 8a7bc17da633d3577eda040ac490cbd8351dc6b9 (patch) | |
| tree | 39054b0494486aa68d3852e5125c855af3e01952 /dex2oat | |
| parent | 3489af22a126e135acfc3c93beec9c31999c0ce6 (diff) | |
| parent | 55c0ac8528fb07c9f0900013b828ee8c60120860 (diff) | |
| download | art-8a7bc17da633d3577eda040ac490cbd8351dc6b9.tar.gz art-8a7bc17da633d3577eda040ac490cbd8351dc6b9.tar.bz2 art-8a7bc17da633d3577eda040ac490cbd8351dc6b9.zip | |
am 55c0ac85: Merge "Enable darwin target build for art."
* commit '55c0ac8528fb07c9f0900013b828ee8c60120860':
Enable darwin target build for art.
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 |