diff options
| author | 2014-05-19 16:49:03 -0700 | |
|---|---|---|
| committer | 2014-05-19 22:27:39 -0700 | |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /disassembler | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 17828fd2e8..dd4e9d5de7 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -46,7 +46,6 @@ define build-libart-disassembler 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 @@ -89,6 +88,7 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk ifeq ($$(art_target_or_host),target) + include external/libcxx/libcxx.mk LOCAL_SHARED_LIBRARIES += libcutils libvixl include $(BUILD_SHARED_LIBRARY) else # host |