Switch setprop to use TOYBOX_ON_ANDROID and fix getprop include.
(I commented out the android-only #include in getprop to do what compile
testing I could, and then forgot to uncomment it.)
diff --git a/toys/android/getprop.c b/toys/android/getprop.c
index 9d5398a..400d80e 100644
--- a/toys/android/getprop.c
+++ b/toys/android/getprop.c
@@ -17,7 +17,7 @@
#define FOR_getprop
#include "toys.h"
-//#include <cutils/properties.h>
+#include <cutils/properties.h>
GLOBALS(
size_t size;
diff --git a/toys/android/setprop.c b/toys/android/setprop.c
index ef24c9a..cbcd152 100644
--- a/toys/android/setprop.c
+++ b/toys/android/setprop.c
@@ -7,6 +7,7 @@
config SETPROP
bool "setprop"
default y
+ depends on TOYBOX_ON_ANDROID
help
usage: setprop NAME VALUE
@@ -16,13 +17,10 @@
#define FOR_setprop
#include "toys.h"
-#if defined(__ANDROID__)
#include <cutils/properties.h>
-#endif
void setprop_main(void)
{
-#if defined(__ANDROID__)
char *name = toys.optargs[0], *value = toys.optargs[1];
char *p;
size_t name_len = strlen(name), value_len = strlen(value);
@@ -48,5 +46,4 @@
if (property_set(name, value))
error_msg("failed to set property '%s' to '%s'", name, value);
-#endif
}