aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-01-14 08:45:36 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-01-14 08:45:36 (GMT)
commit4504060bdea3893154c537377926c8ea45aa062a (patch)
treecce180a53eb5eb34a10acff06a30b0969311e557
parentf00c1775204aacf8e06efbda80138dde8b109f23 (diff)
parentba146a2fd9022aa9a6ae4b5ff01f6c4eddf12f0a (diff)
downloadandroid_external_toybox-4504060bdea3893154c537377926c8ea45aa062a.zip
android_external_toybox-4504060bdea3893154c537377926c8ea45aa062a.tar.gz
android_external_toybox-4504060bdea3893154c537377926c8ea45aa062a.tar.bz2
Snap for 4545621 from ba146a2fd9022aa9a6ae4b5ff01f6c4eddf12f0a to pi-release
Change-Id: I3309a8b66045de006445e0585b4436697294314b
-rw-r--r--.config2
-rw-r--r--Android.mk2
-rw-r--r--generated/config.h4
-rw-r--r--generated/flags.h4
4 files changed, 5 insertions, 7 deletions
diff --git a/.config b/.config
index 868534e..92ea2cc 100644
--- a/.config
+++ b/.config
@@ -116,7 +116,7 @@ CONFIG_FSFREEZE=y
# CONFIG_FTPPUT is not set
CONFIG_GETENFORCE=y
CONFIG_GETFATTR=y
-CONFIG_GETPROP=y
+# CONFIG_GETPROP is not set
# CONFIG_GETTY is not set
CONFIG_GREP=y
# CONFIG_GROUPADD is not set
diff --git a/Android.mk b/Android.mk
index ac05206..f6f49e1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,7 +66,6 @@ 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 \
@@ -282,7 +281,6 @@ ALL_TOOLS := \
flock \
free \
getenforce \
- getprop \
groups \
gunzip \
gzip \
diff --git a/generated/config.h b/generated/config.h
index 593ca7b..d5472e2 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -206,8 +206,8 @@
#define USE_GETENFORCE(...) __VA_ARGS__
#define CFG_GETFATTR 1
#define USE_GETFATTR(...) __VA_ARGS__
-#define CFG_GETPROP 1
-#define USE_GETPROP(...) __VA_ARGS__
+#define CFG_GETPROP 0
+#define USE_GETPROP(...)
#define CFG_GETTY 0
#define USE_GETTY(...)
#define CFG_GREP 1
diff --git a/generated/flags.h b/generated/flags.h
index d9dcedc..f77c67b 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -883,7 +883,7 @@
#undef FLAG_d
#endif
-// getprop >2Z >2Z
+// getprop >2Z
#undef OPTSTR_getprop
#define OPTSTR_getprop ">2Z"
#ifdef CLEANUP_getprop
@@ -3996,7 +3996,7 @@
#ifndef TT
#define TT this.getprop
#endif
-#define FLAG_Z (1<<0)
+#define FLAG_Z (FORCED_FLAG<<0)
#endif
#ifdef FOR_getty