diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-20 17:06:26 -0700 |
|---|---|---|
| committer | Richard Uhler <ruhler@google.com> | 2015-03-23 08:57:57 -0700 |
| commit | 3296f4cb397f75044e7bd5f9b345f4b29d0275f3 (patch) | |
| tree | f7738e2878b6a7390bfd6b77646a806ecd915a88 | |
| parent | f5988cf0c47ff935bb19c89ed0398be5fbe44bb6 (diff) | |
| download | android_art-3296f4cb397f75044e7bd5f9b345f4b29d0275f3.tar.gz android_art-3296f4cb397f75044e7bd5f9b345f4b29d0275f3.tar.bz2 android_art-3296f4cb397f75044e7bd5f9b345f4b29d0275f3.zip | |
Host dex2oat and patchoat require libcutils.
When atrace_* functions are defined for both target and host, host
dex2oat and patchoat require libcutils.
Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
| -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 3f15964d1b..321cd752c5 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 1e160965d6..68ca923561 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 |