commit da9cb71397b34bc7bd17aa33dec8094601e71b5b
author Alin Jerpelea <alin.jerpelea@sonymobile.com> Wed Dec 06 04:22:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 06 04:22:34 2017 +0000
tree 63a3f7bdc14a21ce8224e54a0c72cda116e81a19
parent b2391bf820c0f2cd0e0ca8ecc241b0a8dee18142
parent 5528d15f33d5e8381c815b78ecaa19cbeee1ed3f

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

Change-Id: Ied0f25af8f6e0bed50175bc64ea8e23be04ee87d

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++) {