From 5eb6e5bd73c13f523a7aa4f0a19e5af15632c390 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Fri, 9 Jun 2017 13:25:46 -0700 Subject: [PATCH] init: rename mke2fs tools with _static suffix We build a static version for recovery mode. Give them different names to avoid conflicts with regular version in /system/bin/ Bug: 35219933 Change-Id: I738655ad9b9ad71c63ae604d9a4d659b0b671121 Merged-In: I738655ad9b9ad71c63ae604d9a4d659b0b671121 --- init/init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/init.cpp b/init/init.cpp index 9e238d449..f4546a6dc 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -912,8 +912,8 @@ static void selinux_restore_context() { selinux_android_restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE); selinux_android_restorecon("/dev/device-mapper", 0); - selinux_android_restorecon("/sbin/mke2fs", 0); - selinux_android_restorecon("/sbin/e2fsdroid", 0); + selinux_android_restorecon("/sbin/mke2fs_static", 0); + selinux_android_restorecon("/sbin/e2fsdroid_static", 0); } // Set the UDC controller for the ConfigFS USB Gadgets.