Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: If8daf7f2f2e1b6d688050c4543d2648320bb21ad

diff --cc toys/android/getprop.c
index 6653041,09bb0f0..4afac1a
--- 1/toys/android/getprop.c
--- 2/toys/android/getprop.c
+++ b/toys/android/getprop.c
@@@ -80,19 -40,9 +42,17 @@@ void getprop_main(void
    } else {
      size_t i;
  
-     if (property_list(add_property, NULL))
-       error_exit("property_list failed");
-     qsort(properties, TT.size, sizeof(struct property_info *), property_cmp);
-     for (i = 0; i < TT.size; ++i)
-       printf("[%s]: [%s]\n", properties[i]->name, properties[i]->value);
-     if (CFG_TOYBOX_FREE) free_properties();
+     if (property_list((void *)add_property, 0)) error_exit("property_list");
+     qsort(TT.nv, TT.size, 2*sizeof(char *), qstrcmp);
+     for (i = 0; i<TT.size; i++) printf("[%s]: [%s]\n", TT.nv[i*2],TT.nv[1+i*2]);
+     if (CFG_TOYBOX_FREE) free(TT.nv);
    }
  }
 +
 +#else
 +
 +void getprop_main(void)
 +{
 +}
 +
 +#endif

diff --cc toys/android/setprop.c
index ef24c9a,cbcd152..34e0de4
--- 1/toys/android/setprop.c
--- 2/toys/android/setprop.c
+++ b/toys/android/setprop.c
@@@ -16,9 -17,7 +17,9 @@@ config SETPRO
  #define FOR_setprop
  #include "toys.h"
  
 +#if defined(__ANDROID__)
++
  #include <cutils/properties.h>
- #endif
  
  void setprop_main(void)
  {
@@@ -48,5 -46,4 +48,12 @@@
  
    if (property_set(name, value))
      error_msg("failed to set property '%s' to '%s'", name, value);
- #endif
  }
++
++#else
++
++void setprop_main(void)
++{
++}
++
++#endif