commit f5cd1c9880a79f190fa3526da8fc04d8a29faf38
author Tom Cherry <tomcherry@google.com> Thu Jul 19 08:09:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 19 08:09:29 2018 -0700
tree 004b3124ccbb8936639ab3e30420c6793b013f3a
parent e84fcedabae334c581d2e9da4f2aacf4b6de387c
parent e2959da84800a992e8d746dc28df975a37f51351

Merge "Fix loading ueventd.${ro.hardware}.rc."
am: 1fefb9f129

Change-Id: I7573922226736ece024e31e15fc1a7b9e2d08a9f

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index 6809445..b42a4c6 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -240,7 +240,8 @@
         auto hardware = android::base::GetProperty("ro.hardware", "");
 
         auto ueventd_configuration =
-                ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", hardware});
+                ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc",
+                             "/ueventd." + hardware + ".rc"});
 
         device_handler = DeviceHandler{std::move(ueventd_configuration.dev_permissions),
                                        std::move(ueventd_configuration.sysfs_permissions),