Merge pull request #9358 from ypbnv/TIMOB-24940-6_2_X

[6_2_X][TIMOB-24940] Android: Problem with setTimeout and Toolbar on API 16/17
tidev · Aug 25, 2017 · 17de28c · 17de28c
2 parents 5c0e689 + 8ff7284
commit 17de28c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/android/runtime/v8/src/native/common.mk b/android/runtime/v8/src/native/common.mk
@@ -20,6 +20,9 @@ CFLAGS += -DTI_DEBUG=1 -g
 endif
 
 CFLAGS += -Wno-conversion-null -Wno-format-security -Wno-format -Wno-tautological-compare -Wno-unused-result -Wno-deprecated-register
+# Limitting the stack protector to functions with buffer larger than 4 bytes instead of the default 8
+# This is neccessary due to TIMOB-24940
+CFLAGS += -fstack-protector --param=ssp-buffer-size=4
 
 CLEAN_GEN := rm -f $(GENERATED_DIR)/*
 CLEAN_OBJ := rm -rf $(OBJ_DIR)/*