Merge pull request #28 from pandamicro/master

Fix Spidermonkey android build issues
cocos · Jul 5, 2017 · d003c44 · d003c44
2 parents 7483966 + ac6727a
commit d003c44
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 408 deletions.
diff --git a/android/Android.mk b/android/Android.mk
@@ -99,14 +99,22 @@ include $(PREBUILT_STATIC_LIBRARY)
 #======================================
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := cocos_mozglue_static
+LOCAL_MODULE_FILENAME := mozglue
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libmozglue.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+#======================================
+include $(CLEAR_VARS)
+
 LOCAL_MODULE := spidermonkey_static
 LOCAL_MODULE_FILENAME := js_static
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjs_static.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(TARGET_ARCH_ABI)/include/spidermonkey
 
 LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof
 LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof
-
+LOCAL_STATIC_LIBRARIES += cocos_mozglue_static
 include $(PREBUILT_STATIC_LIBRARY)
 
 #======================================

diff --git a/android/arm64-v8a/include/spidermonkey/jemalloc_types.h b/android/arm64-v8a/include/spidermonkey/jemalloc_types.h
diff --git a/android/arm64-v8a/include/spidermonkey/js-config.h b/android/arm64-v8a/include/spidermonkey/js-config.h
@@ -49,10 +49,10 @@
 /* #undef JS_CRASH_DIAGNOSTICS */
 
 /* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-#define JS_NUNBOX32 1
+/* #undef JS_NUNBOX32 */
 
 /* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-/* #undef JS_PUNBOX64 */
+#define JS_PUNBOX64 1
 
 /* MOZILLA JSAPI version number components */
 #define MOZJS_MAJOR_VERSION 52

diff --git a/android/arm64-v8a/include/spidermonkey/js/HashTable.h b/android/arm64-v8a/include/spidermonkey/js/HashTable.h
@@ -7,10 +7,6 @@
 #ifndef js_HashTable_h
 #define js_HashTable_h
 
-#ifndef UINT64_C
-#define UINT64_C(value) __CONCAT(value, ULL)
-#endif
-
 #include "mozilla/Alignment.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"

diff --git a/android/arm64-v8a/include/spidermonkey/mozmemory.h b/android/arm64-v8a/include/spidermonkey/mozmemory.h