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 /build | |
| parent | 922ddb30982d2597eab634d8b8598bec0eb7d3b7 (diff) | |
| download | art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.gz art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.bz2 art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.zip | |
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 'build')
| -rw-r--r-- | build/Android.libcxx.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/Android.libcxx.mk b/build/Android.libcxx.mk index 3dd1eb7473..f84e9573a9 100644 --- a/build/Android.libcxx.mk +++ b/build/Android.libcxx.mk @@ -14,7 +14,10 @@ # limitations under the License. # +LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.libcxx.mk + ifneq ($(LOCAL_IS_HOST_MODULE),true) include external/stlport/libstlport.mk + LOCAL_CFLAGS += -DART_WITH_STLPORT=1 # include external/libcxx/libcxx.mk endif |