commit 63027017b0c90cc3a2ef8aed7c4204e5308e013f
author Tom Cherry <tomcherry@google.com> Fri Jun 07 15:47:45 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 07 15:47:45 2019 +0000
tree 2610bb432a24ef45019168a26247c743dcb8f937
parent 9f56a6055f63a3133542bb01fb4355c5133c9438
parent d696ed9911bceeb92b4c6d843c81b1c29e2f50e0

Merge "Do not build setprop, start, or stop."

.config

diff --git a/.config b/.config
index 69975c6..1a8e396 100644
--- a/.config
+++ b/.config
@@ -263,7 +263,7 @@
 CONFIG_SEQ=y
 CONFIG_SETENFORCE=y
 CONFIG_SETFATTR=y
-CONFIG_SETPROP=y
+# CONFIG_SETPROP is not set
 CONFIG_SETSID=y
 CONFIG_SHA1SUM=y
 CONFIG_SHA224SUM=y
@@ -281,9 +281,9 @@
 CONFIG_SORT_FLOAT=y
 CONFIG_SORT=y
 CONFIG_SPLIT=y
-CONFIG_START=y
+# CONFIG_START is not set
 CONFIG_STAT=y
-CONFIG_STOP=y
+# CONFIG_STOP is not set
 CONFIG_STRINGS=y
 CONFIG_STTY=y
 # CONFIG_SU is not set

Android.bp

diff --git a/Android.bp b/Android.bp
index 3c9a193..6b55a92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,8 +72,6 @@
         "toys/android/runcon.c",
         "toys/android/sendevent.c",
         "toys/android/setenforce.c",
-        "toys/android/setprop.c",
-        "toys/android/start.c",
         "toys/lsb/dmesg.c",
         "toys/lsb/gzip.c",
         "toys/lsb/hostname.c",
@@ -378,7 +376,6 @@
                 "sendevent",
                 "seq",
                 "setenforce",
-                "setprop",
                 "setsid",
                 "sha1sum",
                 "sha224sum",
@@ -388,9 +385,7 @@
                 "sleep",
                 "sort",
                 "split",
-                "start",
                 "stat",
-                "stop",
                 "strings",
                 "stty",
                 "swapoff",

generated/config.h

diff --git a/generated/config.h b/generated/config.h
index acf5515..86757e2 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -500,8 +500,8 @@
 #define USE_SETENFORCE(...) __VA_ARGS__
 #define CFG_SETFATTR 1
 #define USE_SETFATTR(...) __VA_ARGS__
-#define CFG_SETPROP 1
-#define USE_SETPROP(...) __VA_ARGS__
+#define CFG_SETPROP 0
+#define USE_SETPROP(...)
 #define CFG_SETSID 1
 #define USE_SETSID(...) __VA_ARGS__
 #define CFG_SHA1SUM 1
@@ -536,12 +536,12 @@
 #define USE_SORT(...) __VA_ARGS__
 #define CFG_SPLIT 1
 #define USE_SPLIT(...) __VA_ARGS__
-#define CFG_START 1
-#define USE_START(...) __VA_ARGS__
+#define CFG_START 0
+#define USE_START(...)
 #define CFG_STAT 1
 #define USE_STAT(...) __VA_ARGS__
-#define CFG_STOP 1
-#define USE_STOP(...) __VA_ARGS__
+#define CFG_STOP 0
+#define USE_STOP(...)
 #define CFG_STRINGS 1
 #define USE_STRINGS(...) __VA_ARGS__
 #define CFG_STTY 1

generated/flags.h

diff --git a/generated/flags.h b/generated/flags.h
index 88ce515..c7efb83 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -2442,7 +2442,7 @@
 #undef FLAG_h
 #endif
 
-// setprop <2>2 <2>2
+// setprop   <2>2
 #undef OPTSTR_setprop
 #define OPTSTR_setprop "<2>2"
 #ifdef CLEANUP_setprop