diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /dalvikvm | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 | |
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 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 3 | ||||
| -rw-r--r-- | dalvikvm/dalvikvm.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index e7ed9a7..0ded2d8 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -30,7 +30,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 -include art/build/Android.libcxx.mk +include external/libcxx/libcxx.mk include $(BUILD_EXECUTABLE) # create symlink for the primary version target. @@ -51,7 +51,6 @@ 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 3fa43dc..67794c8 100644 --- a/dalvikvm/dalvikvm.cc +++ b/dalvikvm/dalvikvm.cc @@ -18,14 +18,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> - #include <algorithm> +#include <memory> #include "jni.h" #include "JniInvocation.h" #include "ScopedLocalRef.h" #include "toStringArray.h" -#include "UniquePtrCompat.h" namespace art { @@ -118,7 +117,7 @@ static int dalvikvm(int argc, char** argv) { // We're over-allocating, because this includes the options to the runtime // plus the options to the program. int option_count = argc; - UniquePtr<JavaVMOption[]> options(new JavaVMOption[option_count]()); + std::unique_ptr<JavaVMOption[]> options(new JavaVMOption[option_count]()); // Copy options over. Everything up to the name of the class starts // with a '-' (the function hook stuff is strictly internal). |