diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-15 16:42:40 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-15 16:50:51 -0700 |
| commit | 507dfdd147c97bfbadebfd63584d094b6a4e7b47 (patch) | |
| tree | cce43931b6dcd088cb2932c2491f86116353a27f /dalvikvm | |
| parent | 922ddb30982d2597eab634d8b8598bec0eb7d3b7 (diff) | |
| download | art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.zip art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.gz art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.bz2 | |
Compatibility layer to transition from UniquePtr to std::unique_ptr.
Use ART_WITH_STLPORT (enabled for the target) to cause the use of UniquePtr,
for the host switch to std::unique_ptr. For now the type remains called
UniquePtr.
Make dalvik compile with clang on the host, move its build to C++11.
Change-Id: I5ba8d2757904bc089ed62047ea03de3c0853fb12
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 5 | ||||
| -rw-r--r-- | dalvikvm/dalvikvm.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index e99c76f..8076b61 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -dalvikvm_cflags := -Wall -Werror -Wextra +dalvikvm_cflags := -Wall -Werror -Wextra -std=gnu++11 include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm @@ -24,6 +24,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc LOCAL_CFLAGS := $(dalvikvm_cflags) +LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both @@ -37,9 +38,11 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc LOCAL_CFLAGS := $(dalvikvm_cflags) +LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc index 8d71a7c..582adc0 100644 --- a/dalvikvm/dalvikvm.cc +++ b/dalvikvm/dalvikvm.cc @@ -24,7 +24,7 @@ #include "JniInvocation.h" #include "ScopedLocalRef.h" #include "toStringArray.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { |