コミット: 068dd73cdac2dd536ef3b3a00c3578d3580db0aa - external-busybox (git)

external/busybox

コミットメタ情報

• リビジョン: 068dd73cdac2dd536ef3b3a00c3578d3580db0aa (tree)
• 日時: 2014-08-20 06:28:38
• 作者: HazouPH <jgrharbers@gmai...>
• コミッター: HazouPH

ログメッセージ

[x86] Android 4.4.4 for x86 needs new implementation of "security_compute_relabel"

Change-Id: I2e15f58f11c9ee74ed8e1b7bf731efd881b890d9

変更サマリ

• modified: android/selinux/stubs.c

差分

--- a/android/selinux/stubs.c
+++ b/android/selinux/stubs.c
@@ -19,18 +19,10 @@ int get_default_context(const char* user,
 /* Compute a relabeling decision and set *newcon to refer to it.
    Caller must free via freecon.
    Stub not implemented in bionic, but declared in selinux.h */
-#if defined(BIONIC_L) || !defined(__i386__)
 int security_compute_relabel(const char *scon UNUSED_PARAM,
 	const char *tcon,
 	security_class_t tclass UNUSED_PARAM,
 	char ** newcon)
-#else
-/* this was changed after 4.4.2 */
-int security_compute_relabel(const security_context_t scon UNUSED_PARAM,
-	const security_context_t tcon,
-	security_class_t tclass UNUSED_PARAM,
-	security_context_t *newcon)
-#endif
 {
 	if (tcon)
 		*newcon = strdup(tcon);