Merge pull request #118 from PatriceJiang/v2.4-add-armv7-placeholder-to-libv8

[2.4] update v8 arm xcode12
update libv8
2020-09-18 19:34:24 +08:00 · 2020-09-18 18:49:32 +08:00 · 2020-08-12 15:09:58 +08:00 · 2020-08-12 14:52:45 +08:00
2 changed files with 7 additions and 5 deletions
@@ -127,11 +127,13 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(TARGET_ARCH_ABI)/include/freetype
 include $(PREBUILT_STATIC_LIBRARY)

 #======================================
-include $(CLEAR_VARS)
+ifneq ($(TARGET_ARCH),x86_64)
+   include $(CLEAR_VARS)

-LOCAL_MODULE := cocos2djni
-LOCAL_MODULE_FILENAME := libcocos2djni
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcocos2djni.a
-include $(PREBUILT_STATIC_LIBRARY)
+   LOCAL_MODULE := cocos2djni
+   LOCAL_MODULE_FILENAME := libcocos2djni
+   LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcocos2djni.a
+   include $(PREBUILT_STATIC_LIBRARY)
+endif
 #======================================
 #$(call import-module,android/cpufeatures)
Author	SHA1	Message	Date
江战andGitHub	8dc371e964	Merge pull request #118 from PatriceJiang/v2.4-add-armv7-placeholder-to-libv8 [2.4] update v8 arm xcode12	2020-09-18 19:34:24 +08:00
PatriceJiang	b366038895	update libv8	2020-09-18 18:49:32 +08:00
江战andGitHub	aab594da1a	Merge pull request #116 from xianyinchen/v2.4 disable cocos2djni library for x86_64.	2020-08-12 15:09:58 +08:00
chenxianyin	b0aebf058f	disable cocos2djni library for x86_64.	2020-08-12 14:52:45 +08:00