Merge "linker: add support for odm partition"
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 66ae191..7bf3a5b 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -90,13 +90,17 @@
#if defined(__LP64__)
static const char* const kSystemLibDir = "/system/lib64";
+static const char* const kOdmLibDir = "/odm/lib64";
static const char* const kVendorLibDir = "/vendor/lib64";
static const char* const kAsanSystemLibDir = "/data/asan/system/lib64";
+static const char* const kAsanOdmLibDir = "/data/asan/odm/lib64";
static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64";
#else
static const char* const kSystemLibDir = "/system/lib";
+static const char* const kOdmLibDir = "/odm/lib";
static const char* const kVendorLibDir = "/vendor/lib";
static const char* const kAsanSystemLibDir = "/data/asan/system/lib";
+static const char* const kAsanOdmLibDir = "/data/asan/odm/lib";
static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib";
#endif
@@ -104,6 +108,7 @@
static const char* const kDefaultLdPaths[] = {
kSystemLibDir,
+ kOdmLibDir,
kVendorLibDir,
nullptr
};
@@ -111,6 +116,8 @@
static const char* const kAsanDefaultLdPaths[] = {
kAsanSystemLibDir,
kSystemLibDir,
+ kAsanOdmLibDir,
+ kOdmLibDir,
kAsanVendorLibDir,
kVendorLibDir,
nullptr