diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-16 16:34:44 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-16 16:35:44 -0700 |
| commit | bd5ea6a2f7c61c4cd7b66fead1bedd96e938369d (patch) | |
| tree | 1c1dde0d817303e669c413a919c192e2f3463bb0 /disassembler | |
| parent | 5e17616b7386159cef8f2fb6ffe3cbc4fb1373e4 (diff) | |
| download | art-bd5ea6a2f7c61c4cd7b66fead1bedd96e938369d.zip art-bd5ea6a2f7c61c4cd7b66fead1bedd96e938369d.tar.gz art-bd5ea6a2f7c61c4cd7b66fead1bedd96e938369d.tar.bz2 | |
Preparation for transition to libc++.
Move the dependency on libc++ to its own makefile so that we can switch in a
single place between libc++ and stlport.
Change-Id: Ie61e7d054dcd049e36d5e7298c27d8a4abe6edf7
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 56929fc..17828fd 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -43,11 +43,10 @@ define build-libart-disassembler art_ndebug_or_debug := $(2) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - else - LOCAL_IS_HOST_MODULE := true + ifeq ($$(art_target_or_host),host) + LOCAL_IS_HOST_MODULE := true endif + include art/build/Android.libcxx.mk LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) ifeq ($$(art_ndebug_or_debug),ndebug) LOCAL_MODULE := libart-disassembler |