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

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 9df69f0..d433fd5 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -344,9 +344,6 @@
   art_clang := $(3)
 
   include $(CLEAR_VARS)
-  ifeq ($$(art_target_or_host),target)
-    include external/stlport/libstlport.mk
-  endif
   LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
   ifeq ($$(art_ndebug_or_debug),ndebug)
     LOCAL_MODULE := libart
@@ -366,6 +363,8 @@
     LOCAL_IS_HOST_MODULE := true
   endif
 
+  include art/build/Android.libcxx.mk
+
   GENERATED_SRC_DIR := $$(call local-generated-sources-dir)
   ENUM_OPERATOR_OUT_CC_FILES := $$(patsubst %.h,%_operator_out.cc,$$(LIBART_ENUM_OPERATOR_OUT_HEADER_FILES))
   ENUM_OPERATOR_OUT_GEN := $$(addprefix $$(GENERATED_SRC_DIR)/,$$(ENUM_OPERATOR_OUT_CC_FILES))