diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-13 14:42:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 14:42:47 -0800 |
| commit | c0da2aebebbad031964546f63a3434225b0c83ab (patch) | |
| tree | 6f7a10470e6ff8fbcd5d8b5ad81e6c72edc62971 /Android.libv8.mk | |
| parent | e7d60fe8c8ca03dbd9c2fda842f83143829054fa (diff) | |
| parent | 1a88aea1194987ce1bf166c664fd8b157eb5a5c1 (diff) | |
| download | android_external_v8-c0da2aebebbad031964546f63a3434225b0c83ab.tar.gz android_external_v8-c0da2aebebbad031964546f63a3434225b0c83ab.tar.bz2 android_external_v8-c0da2aebebbad031964546f63a3434225b0c83ab.zip | |
am 1a88aea1: am b2f047a9: Merge changes Icc337d19,Ica9535de
* commit '1a88aea1194987ce1bf166c664fd8b157eb5a5c1':
Use stlport for libv8 and v8shell
Fix v8shell to use liblog, rather than libcutils
Diffstat (limited to 'Android.libv8.mk')
| -rw-r--r-- | Android.libv8.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index 14c4e19f..f61f5d79 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -4,6 +4,8 @@ LOCAL_PATH := $(call my-dir) # =================================================== include $(CLEAR_VARS) +include external/stlport/libstlport.mk + # Set up the target identity LOCAL_MODULE := libv8 LOCAL_MODULE_CLASS := STATIC_LIBRARIES @@ -90,6 +92,6 @@ ifeq ($(DEBUG_V8),true) LOCAL_CFLAGS += -DDEBUG -UNDEBUG endif -LOCAL_C_INCLUDES := $(LOCAL_PATH)/src +LOCAL_C_INCLUDES += $(LOCAL_PATH)/src include $(BUILD_STATIC_LIBRARY) |