commit b52fae2d26bef45bb165c28677866b029d6445e8
author Jin Qian <jinqian@google.com> Fri Jun 09 13:25:46 2017 -0700
committer Jin Qian <jinqian@google.com> Mon Jun 26 17:15:15 2017 -0700
tree c7e0cea7468b925c5e58aa5895fd7aecd0f4b8ab
parent 1f4c20461f3eb505723d67efecaf5bf857ced45e

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

diff --git a/init/init.cpp b/init/init.cpp
index 9e238d4..f4546a6 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -912,8 +912,8 @@
     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.