commit 4a33cee3f83c0dadda8a50a11698c2f77e8614e6
author Alin Jerpelea <alin.jerpelea@sonymobile.com> Wed Dec 06 04:10:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 06 04:10:02 2017 +0000
tree 600967d2173b53a9343796c86fae58ae444088c1
parent 1ab4d182bddae30680f963f6b8846dfaa7c457f8
parent 5b78366665217f7e05c0cb849b3c494bffa91d45

Merge "Allow firmware loading from ODM partition"
am: 5b78366665

Change-Id: Ic7c19c97598fc4087af9a1b7fcc28d5ed0600558

init/firmware_handler.cpp

diff --git a/init/firmware_handler.cpp b/init/firmware_handler.cpp
index b686885..8c8d9f2 100644
--- a/init/firmware_handler.cpp
+++ b/init/firmware_handler.cpp
@@ -78,8 +78,8 @@
         return;
     }
 
-    static const char* firmware_dirs[] = {"/etc/firmware/", "/vendor/firmware/",
-                                          "/firmware/image/"};
+    static const char* firmware_dirs[] = {"/etc/firmware/", "/odm/firmware/",
+                                          "/vendor/firmware/", "/firmware/image/"};
 
 try_loading_again:
     for (size_t i = 0; i < arraysize(firmware_dirs); i++) {