Merge "properties.h: avoid duplicating constant values"
diff --git a/include/cutils/properties.h b/include/cutils/properties.h
index 25fd67a..7e4ed93 100644
--- a/include/cutils/properties.h
+++ b/include/cutils/properties.h
@@ -17,6 +17,8 @@
#ifndef __CUTILS_PROPERTIES_H
#define __CUTILS_PROPERTIES_H
+#include <sys/system_properties.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -28,8 +30,8 @@
** WARNING: system/bionic/include/sys/system_properties.h also defines
** these, but with different names. (TODO: fix that)
*/
-#define PROPERTY_KEY_MAX 32
-#define PROPERTY_VALUE_MAX 92
+#define PROPERTY_KEY_MAX PROP_NAME_MAX
+#define PROPERTY_VALUE_MAX PROP_VALUE_MAX
/* property_get: returns the length of the value which will never be
** greater than PROPERTY_VALUE_MAX - 1 and will always be zero terminated.