diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-30 18:31:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-30 18:31:28 +0000 |
| commit | 263f20b7a04b33f0e4b8f43b9a69ee9a1ddba564 (patch) | |
| tree | 00b241fb34665cdf905712d8e1b9892fe2ba8498 /dex2oat | |
| parent | 26dcecb0ef620fb225cd5dd39f6e41b07e34c83d (diff) | |
| parent | 872dd8208f00c667af8d9e0fd07fdd0ada56d437 (diff) | |
| download | art-263f20b7a04b33f0e4b8f43b9a69ee9a1ddba564.zip art-263f20b7a04b33f0e4b8f43b9a69ee9a1ddba564.tar.gz art-263f20b7a04b33f0e4b8f43b9a69ee9a1ddba564.tar.bz2 | |
Merge "Tidy and reduce ART library dependencies on the host."
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 2ef826b..4f39c42 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -38,8 +38,8 @@ 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_HOST_NDEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,host,ndebug)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler libziparchive-host,art/compiler,host,ndebug)) endif ifeq ($(ART_BUILD_HOST_DEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler libziparchive-host,art/compiler,host,debug)) endif |