diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-31 16:31:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 16:31:12 +0000 |
| commit | 3ebee94b7b3af89e7cd470ab70013ac0505d2de4 (patch) | |
| tree | a2a418327093087c15eebe6f5f8b95abe76b0320 | |
| parent | 5d4430b94446ea303327a311ad153767ed689863 (diff) | |
| parent | 3296f4cb397f75044e7bd5f9b345f4b29d0275f3 (diff) | |
| download | art-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.zip art-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.tar.gz art-3ebee94b7b3af89e7cd470ab70013ac0505d2de4.tar.bz2 | |
Merge "Host dex2oat and patchoat require libcutils."
| -rw-r--r-- | dex2oat/Android.mk | 4 | ||||
| -rw-r--r-- | patchoat/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 3f15964..321cd75 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 diff --git a/patchoat/Android.mk b/patchoat/Android.mk index 1e16096..68ca923 100644 --- a/patchoat/Android.mk +++ b/patchoat/Android.mk @@ -38,8 +38,8 @@ endif # We always build patchoat 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,patchoat,$(PATCHOAT_SRC_FILES),,art/compiler,host,ndebug)) + $(eval $(call build-art-executable,patchoat,$(PATCHOAT_SRC_FILES),libcutils,art/compiler,host,ndebug)) endif ifeq ($(ART_BUILD_HOST_DEBUG),true) - $(eval $(call build-art-executable,patchoat,$(PATCHOAT_SRC_FILES),,art/compiler,host,debug)) + $(eval $(call build-art-executable,patchoat,$(PATCHOAT_SRC_FILES),libcutils,art/compiler,host,debug)) endif |