commit e0d0d1af6e1079cf26f91d88af494ade0e786cbc
author Steve Block <steveblock@google.com> Fri Jan 20 16:06:48 2012 +0000
committer Steve Block <steveblock@google.com> Thu Feb 02 17:06:57 2012 +0000
tree 2ae5b230002435f4aa4aa576ddf178d1de1ab4cd
parent 9413c4970b1f1fb8cbf231c32762cefb5567e071

Use stlport for libv8 and v8shell

Currently we incorrectly use the STL implementation from the toolchain.

Change-Id: Icc337d19e46188a818b07ceab7be7721ebf12ffa

Android.v8shell.mk

diff --git a/Android.v8shell.mk b/Android.v8shell.mk
index b47ee0d..efe8ddf 100644
--- a/Android.v8shell.mk
+++ b/Android.v8shell.mk
@@ -1,13 +1,16 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_SHARED_LIBRARIES := libstlport
+include external/stlport/libstlport.mk
+
 LOCAL_SRC_FILES:= samples/shell.cc
 LOCAL_MODULE := v8shell
 
 LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_STATIC_LIBRARIES := libv8
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES += liblog
 
 LOCAL_MODULE_TAGS := optional