Fix library path for aarch64

Change-Id: I1c576aadef1c5a096823c251d9416af5314f5eeb
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb3d5cac2d1cebe67bfbfe6f4331202dcaf52492..fc8276c1b8e1c4e8b525047d51f57f541ae8b832 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ ADD_DEFINITIONS("-DSHARE_PREFIX=\"/usr/share/aul\"")
 ADD_DEFINITIONS("-DLAUNCHPAD_LOG")
 ADD_DEFINITIONS("-DPRELOAD_ACTIVATE")
 ADD_DEFINITIONS("-DPREEXEC_ACTIVATE")
+ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")
 
 ## Compile flags
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")

diff --git a/src/launchpad-loader/src/launchpad_loader.c b/src/launchpad-loader/src/launchpad_loader.c
index cda24574923432fd39c598921f2167c1bc5f0039..f87150ba8beb19c204c47634c5d583dbc1c3fdf2 100644 (file)
--- a/src/launchpad-loader/src/launchpad_loader.c
+++ b/src/launchpad-loader/src/launchpad_loader.c
@@ -38,7 +38,7 @@
 #define PR_TASK_PERF_USER_TRACE 666
 #endif
 
-#define PATH_LIB_VC_ELM "/usr/lib/libvc-elm.so.0"
+#define PATH_LIB_VC_ELM LIBDIR"/libvc-elm.so.0"
 
 extern bundle *launchpad_loader_get_bundle(void);
 
@@ -475,4 +475,3 @@ int main(int argc, char **argv)
 
        return launchpad_loader_main(argc, argv, &callbacks, &adapter, NULL);
 }
-

diff --git a/src/launchpad-parser/launchpad_parser_plugin.cc b/src/launchpad-parser/launchpad_parser_plugin.cc
index d8b23c085c89b25feaa6b4f2efa957e71219d03f..135a554e8e09b6adac215d8ddfac91d3ffa556e5 100644 (file)
--- a/src/launchpad-parser/launchpad_parser_plugin.cc
+++ b/src/launchpad-parser/launchpad_parser_plugin.cc
@@ -54,7 +54,7 @@ int LaunchpadParser::WriteToFile(std::string pkgid) {
     if (i->GetPreloadLib().size() > 0) {
       out_file << "EXTRA_ARRAY    preload \n";
       for (auto& lib : i->GetPreloadLib()) {
-        out_file << "EXTRA_ARRAY_VAL    /usr/lib/" + lib + "\n";
+        out_file << "EXTRA_ARRAY_VAL    "LIBDIR"/" + lib + "\n";
       }
     }
     out_file.close();