aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Astone <ales.astone@gmail.com>2019-03-31 14:26:27 (GMT)
committerAlessandro Astone <ales.astone@gmail.com>2019-03-31 14:36:00 (GMT)
commitfd4a589ce3e6802cc9f2677ee90deef058b4f848 (patch)
tree81034bebec740d812a862cbe31a71d5f1858f0dc
parentfd080612a43391e2735cc68f0a02f8e5efe853d2 (diff)
downloadandroid_external_toybox-fd4a589ce3e6802cc9f2677ee90deef058b4f848.zip
android_external_toybox-fd4a589ce3e6802cc9f2677ee90deef058b4f848.tar.gz
android_external_toybox-fd4a589ce3e6802cc9f2677ee90deef058b4f848.tar.bz2
Revert "Reland: Stop building getprop"refs/changes/16/245316/1
This partially reverts commit 69a95fdec15c9e2db6e70fda32b5f5d0f7395ac4. Keep building it, but don't symlink it Change-Id: Iff9d545ddec91e360cbd11aa32ca422fd5b92608
-rw-r--r--.config2
-rw-r--r--Android.mk1
-rw-r--r--generated/config.h4
-rw-r--r--generated/flags.h4
4 files changed, 6 insertions, 5 deletions
diff --git a/.config b/.config
index d0de7b0..9cbdb07 100644
--- a/.config
+++ b/.config
@@ -118,7 +118,7 @@ CONFIG_FSFREEZE=y
# CONFIG_FTPPUT is not set
CONFIG_GETENFORCE=y
CONFIG_GETFATTR=y
-# CONFIG_GETPROP is not set
+CONFIG_GETPROP=y
# CONFIG_GETTY is not set
CONFIG_GREP=y
# CONFIG_GROUPADD is not set
diff --git a/Android.mk b/Android.mk
index 6daad4a..1969cd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,6 +66,7 @@ common_SRC_FILES := \
lib/xwrap.c \
main.c \
toys/android/getenforce.c \
+ toys/android/getprop.c \
toys/android/load_policy.c \
toys/android/log.c \
toys/android/restorecon.c \
diff --git a/generated/config.h b/generated/config.h
index 79da5e6..936ec83 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -210,8 +210,8 @@
#define USE_GETENFORCE(...) __VA_ARGS__
#define CFG_GETFATTR 1
#define USE_GETFATTR(...) __VA_ARGS__
-#define CFG_GETPROP 0
-#define USE_GETPROP(...)
+#define CFG_GETPROP 1
+#define USE_GETPROP(...) __VA_ARGS__
#define CFG_GETTY 0
#define USE_GETTY(...)
#define CFG_GREP 1
diff --git a/generated/flags.h b/generated/flags.h
index 7e2ba20..4928b94 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -900,7 +900,7 @@
#undef FLAG_d
#endif
-// getprop >2Z
+// getprop >2Z >2Z
#undef OPTSTR_getprop
#define OPTSTR_getprop ">2Z"
#ifdef CLEANUP_getprop
@@ -4029,7 +4029,7 @@
#ifndef TT
#define TT this.getprop
#endif
-#define FLAG_Z (FORCED_FLAG<<0)
+#define FLAG_Z (1<<0)
#endif
#ifdef FOR_getty