diff options
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 231fba1b02..e99c76f612 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 3486c1d6bd..8d71a7ca67 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" |