Use stlport for libv8 and v8shell
Currently we incorrectly use the STL implementation from the toolchain.
Change-Id: Icc337d19e46188a818b07ceab7be7721ebf12ffa
diff --git a/Android.libv8.mk b/Android.libv8.mk
index f2a13c8..2e36b26 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -4,6 +4,8 @@
# ===================================================
include $(CLEAR_VARS)
+include external/stlport/libstlport.mk
+
# Set up the target identity
LOCAL_MODULE := libv8
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -79,6 +81,6 @@
LOCAL_CFLAGS += -DDEBUG -UNDEBUG
endif
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
include $(BUILD_STATIC_LIBRARY)
diff --git a/Android.mk b/Android.mk
index c69a2cc..77fd2e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,6 @@
##
BASE_PATH := $(call my-dir)
-include $(CLEAR_VARS)
# Two ways to control which JS engine is used:
# 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8'
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