aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-05-07 11:09:44 -0700
committerElliott Hughes <enh@google.com>2016-05-07 11:09:44 -0700
commitd9417c06308cf9dd34941ca338ac31a9df54b42a (patch)
treebece35c3b86a4acbf5e4b5786d6862f6abbcdd4c
parent7844a48fe792b5effdb5acbcb35aa20ab97379ed (diff)
downloadandroid_external_toybox-d9417c06308cf9dd34941ca338ac31a9df54b42a.tar.gz
android_external_toybox-d9417c06308cf9dd34941ca338ac31a9df54b42a.tar.bz2
android_external_toybox-d9417c06308cf9dd34941ca338ac31a9df54b42a.zip
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.
Bug: http://b/27729263 Change-Id: Ibe1f530198045e4133960af61800b40d4348c59a
-rw-r--r--.config2
-rw-r--r--generated/config.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/.config b/.config
index 390dc0dc..aeea8aa4 100644
--- a/.config
+++ b/.config
@@ -330,7 +330,7 @@ CONFIG_TOYBOX_HELP=y
CONFIG_TOYBOX_HELP_DASHDASH=y
CONFIG_TOYBOX_I18N=y
# CONFIG_TOYBOX_FREE is not set
-# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_NORECURSE=y
# CONFIG_TOYBOX_DEBUG is not set
CONFIG_TOYBOX_UID_SYS=100
CONFIG_TOYBOX_UID_USR=500
diff --git a/generated/config.h b/generated/config.h
index c0558be3..27e216b8 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -590,8 +590,8 @@
#define USE_TOYBOX_I18N(...) __VA_ARGS__
#define CFG_TOYBOX_FREE 0
#define USE_TOYBOX_FREE(...)
-#define CFG_TOYBOX_NORECURSE 0
-#define USE_TOYBOX_NORECURSE(...)
+#define CFG_TOYBOX_NORECURSE 1
+#define USE_TOYBOX_NORECURSE(...) __VA_ARGS__
#define CFG_TOYBOX_DEBUG 0
#define USE_TOYBOX_DEBUG(...)
#define CFG_TOYBOX_UID_SYS 100