summaryrefslogtreecommitdiffstats
path: root/dex2oat
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2015-03-31 16:31:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-31 16:31:12 +0000
commit3ebee94b7b3af89e7cd470ab70013ac0505d2de4 (patch)
treea2a418327093087c15eebe6f5f8b95abe76b0320 /dex2oat
parent5d4430b94446ea303327a311ad153767ed689863 (diff)
parent3296f4cb397f75044e7bd5f9b345f4b29d0275f3 (diff)
downloadart-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.tar.gz
art-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.tar.bz2
art-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.zip
Merge "Host dex2oat and patchoat require libcutils."
Diffstat (limited to 'dex2oat')
-rw-r--r--dex2oat/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk
index 3f15964d1..321cd752c 100644
--- a/dex2oat/Android.mk
+++ b/dex2oat/Android.mk
@@ -46,8 +46,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 libziparchive-host,art/compiler,host,ndebug,$(dex2oat_host_arch)))
+ $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libziparchive-host,art/compiler,host,ndebug,$(dex2oat_host_arch)))
endif
ifeq ($(ART_BUILD_HOST_DEBUG),true)
- $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler libziparchive-host,art/compiler,host,debug,$(dex2oat_host_arch)))
+ $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libziparchive-host,art/compiler,host,debug,$(dex2oat_host_arch)))
endif