From 7d5136d998baaad4a27e45f9fb99b45bac2c9bb8 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 9 Mar 2016 02:54:30 -0800 Subject: [PATCH] toybox: Fix build of static executable * Avoid duplicating a symbol in libselinux Change-Id: I154793f7939aaa172153331313833290621efc50 --- toys/android/getprop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toys/android/getprop.c b/toys/android/getprop.c index efb1e447..cd2c238a 100644 --- a/toys/android/getprop.c +++ b/toys/android/getprop.c @@ -54,7 +54,7 @@ static void add_property(char *name, char *value, void *unused) } // Needed to supress extraneous "Loaded property_contexts from" message -int selinux_log_callback(int type, const char *fmt, ...) { +int selinux_log_callback_quiet(int type, const char *fmt, ...) { va_list ap; if (type == SELINUX_INFO) return 0; @@ -69,7 +69,7 @@ void getprop_main(void) if (toys.optflags & FLAG_Z) { union selinux_callback cb; - cb.func_log = selinux_log_callback; + cb.func_log = selinux_log_callback_quiet; selinux_set_callback(SELINUX_CB_LOG, cb); TT.handle = selinux_android_prop_context_handle(); if (!TT.handle) error_exit("unable to get selinux property context handle"); -- 2.11.0