commit 4364cea04d7f11fe7f71bf63c42c44cd430cb309
author Jin Qian <jinqian@google.com> Wed Jul 05 22:40:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 05 22:40:42 2017 +0000
tree 2824c8e322515840cfc01ac8df66ed1388a60557
parent 047fb4e1d89797f6564d950630455eb6e63ec423
parent 6dcf2ffb5d98b671d601a6b56aa079daffc450b1

Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev
am: 5c5c544e80

Change-Id: Ifee5b6516fe3aee03df845a46421753295cbc740

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 2335b3a..b498b8d 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.