commit bd5ea6a2f7c61c4cd7b66fead1bedd96e938369d
author Ian Rogers <irogers@google.com> Wed Apr 16 16:34:44 2014 -0700
committer Ian Rogers <irogers@google.com> Wed Apr 16 16:35:44 2014 -0700
tree 1c1dde0d817303e669c413a919c192e2f3463bb0
parent 5e17616b7386159cef8f2fb6ffe3cbc4fb1373e4

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

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index b17cd52..6d656e6 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -158,11 +158,10 @@
   art_ndebug_or_debug := $(2)
 
   include $(CLEAR_VARS)
-  ifeq ($$(art_target_or_host),target)
-    include external/stlport/libstlport.mk
-  else
+  ifeq ($$(art_target_or_host),host)
     LOCAL_IS_HOST_MODULE := true
   endif
+  include art/build/Android.libcxx.mk
   LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
   ifeq ($$(art_ndebug_or_debug),ndebug)
     LOCAL_MODULE := libart-compiler