From c82048bdeaafce687a345083fd26ab44e2aff5ff Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 18 Aug 2017 15:32:25 +0800 Subject: [PATCH] Updates Android.mk --- .../cocos/scripting/js-bindings/proj.android/Android.mk | 4 ++-- .../anysdk/js-bindings/jsb_anysdk_basic_conversions.h | 9 +-------- native/external/config.json | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/native/cocos/scripting/js-bindings/proj.android/Android.mk b/native/cocos/scripting/js-bindings/proj.android/Android.mk index f39fe9d0cc..d397e38b19 100644 --- a/native/cocos/scripting/js-bindings/proj.android/Android.mk +++ b/native/cocos/scripting/js-bindings/proj.android/Android.mk @@ -91,8 +91,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual \ LOCAL_EXPORT_LDLIBS := -lz LOCAL_STATIC_LIBRARIES := cocos2dx_static -LOCAL_STATIC_LIBRARIES += spidermonkey_static spidermonkey_glue_static -LOCAL_WHOLE_STATIC_LIBRARIES += v8_base_static v8_inspector_static v8_libplatform_static v8_libbase_static v8_libsampler_static v8_nosnapshot_static v8_builtins_setup_static v8_builtins_generators_static uv_static +# LOCAL_STATIC_LIBRARIES += spidermonkey_static +LOCAL_STATIC_LIBRARIES += v8_static include $(BUILD_STATIC_LIBRARY) #============================================================== diff --git a/native/extensions/anysdk/js-bindings/jsb_anysdk_basic_conversions.h b/native/extensions/anysdk/js-bindings/jsb_anysdk_basic_conversions.h index 9b466dc4c7..61851edbf2 100644 --- a/native/extensions/anysdk/js-bindings/jsb_anysdk_basic_conversions.h +++ b/native/extensions/anysdk/js-bindings/jsb_anysdk_basic_conversions.h @@ -1,5 +1,4 @@ -#ifndef __JS_BASIC_CONVERSIONS_H__ -#define __JS_BASIC_CONVERSIONS_H__ +#pragma once #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" @@ -11,12 +10,6 @@ #include "ProtocolUser.h" #include "ProtocolREC.h" -#ifndef CCLOGINFO -#define CCLOGINFO(...) -#endif - // to native bool seval_to_TVideoInfo(const se::Value& v, anysdk::framework::TVideoInfo* ret); - -#endif /* __JS_ANYSDK_CONVERSIONS_H__ */ diff --git a/native/external/config.json b/native/external/config.json index fe7df4a796..6e9c81810e 100644 --- a/native/external/config.json +++ b/native/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3-deps-39", + "version": "v3-deps-40", "zip_file_size": "114318593", "repo_name": "cocos2d-x-lite-external", "repo_parent": "https://github.com/cocos-creator/"