diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-13 14:39:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 14:39:57 -0800 |
| commit | 1a88aea1194987ce1bf166c664fd8b157eb5a5c1 (patch) | |
| tree | 2ae5b230002435f4aa4aa576ddf178d1de1ab4cd | |
| parent | c81724a8d928749d8394a4ad7e1d5f6367320d3a (diff) | |
| parent | b2f047a93f0b021b7f4a9ee3ce41b93c22209dce (diff) | |
| download | v8-1a88aea1194987ce1bf166c664fd8b157eb5a5c1.tar.gz | |
am b2f047a9: Merge changes Icc337d19,Ica9535de
* commit 'b2f047a93f0b021b7f4a9ee3ce41b93c22209dce':
Use stlport for libv8 and v8shell
Fix v8shell to use liblog, rather than libcutils
| -rw-r--r-- | Android.libv8.mk | 4 | ||||
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | Android.v8shell.mk | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index f2a13c8a..2e36b262 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 @@ -79,6 +81,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) @@ -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 6509498b..efe8ddfc 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 := libcutils +LOCAL_SHARED_LIBRARIES += liblog LOCAL_MODULE_TAGS := optional |