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 /dalvikvm | |
| 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 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 4 | ||||
| -rw-r--r-- | dalvikvm/dalvikvm.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 231fba1..e99c76f 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -29,7 +29,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm LOCAL_MODULE_STEM_64 := dalvikvm64 -include external/stlport/libstlport.mk +include art/build/Android.libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) @@ -43,6 +43,8 @@ LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_IS_HOST_MODULE := true +include art/build/Android.libcxx.mk include $(BUILD_HOST_EXECUTABLE) ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) endif diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc index 3486c1d..8d71a7c 100644 --- a/dalvikvm/dalvikvm.cc +++ b/dalvikvm/dalvikvm.cc @@ -15,11 +15,10 @@ */ #include <signal.h> +#include <stdio.h> +#include <string.h> #include <algorithm> -#include <cstdio> -#include <cstring> -#include <string> #include "jni.h" #include "JniInvocation.h" |