diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 20:48:42 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-10 23:19:29 -0700 |
| commit | c5f17732d8144491c642776b6b48c85dfadf4b52 (patch) | |
| tree | 811daa488ae5ee5dfd9b3b73bd210bc1506e5ca1 /disassembler | |
| parent | 08654d40cdd256f6a6c8619bf06d04d4c819714a (diff) | |
| download | art-c5f17732d8144491c642776b6b48c85dfadf4b52.zip art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.gz art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.bz2 | |
Remove deprecated WITH_HOST_DALVIK.
Bug: 13751317
Fix the Mac build:
- disable x86 selector removal that causes OS/X 10.9 kernel panics,
- madvise don't need does zero memory on the Mac, factor into MemMap
routine,
- switch to the elf.h in elfutils to avoid Linux kernel dependencies,
- we can't rely on exclusive_owner_ being available from other pthread
libraries so maintain our own when futexes aren't available (we
can't rely on the OS/X 10.8 hack any more),
- fix symbol naming in assembly code,
- work around C library differences,
- disable backtrace in DumpNativeStack to avoid a broken libbacktrace
dependency,
- disable main thread signal handling logic,
- align the stack in stub_test,
- use $(HOST_SHLIB_SUFFIX) rather than .so in host make file variables.
Not all host tests are passing on the Mac with this change. dex2oat
works as does running HelloWorld.
Change-Id: I5a232aedfb2028524d49daa6397a8e60f3ee40d3
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index b4b194d..feacbde 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -98,12 +98,10 @@ endif ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-libart-disassembler,target,debug)) endif -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-libart-disassembler,host,ndebug)) - endif - ifeq ($(ART_BUILD_DEBUG),true) - $(eval $(call build-libart-disassembler,host,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-libart-disassembler,host,ndebug)) +endif +ifeq ($(ART_BUILD_DEBUG),true) + $(eval $(call build-libart-disassembler,host,debug)) endif |