Merge lp:~vicamo/platform-api/remove-system-lib-prefix-from-lib-path-2 into lp:platform-api

Proposed by You-Sheng Yang on 2016-08-05
Status: Merged
Merged at revision: 330
Proposed branch: lp:~vicamo/platform-api/remove-system-lib-prefix-from-lib-path-2
Merge into: lp:platform-api
Diff against target: 24 lines (+2/-2)
2 files modified
src/ubuntu/application/touch/hybris/hybris_module.h (+1/-1)
src/ubuntu/hardware/android_hw_module.h (+1/-1)
To merge this branch: bzr merge lp:~vicamo/platform-api/remove-system-lib-prefix-from-lib-path-2
Reviewer Review Type Date Requested Status
Simon Fels 2016-08-05 Approve on 2016-08-16
Review via email: mp+302111@code.launchpad.net

This proposal supersedes a proposal from 2016-08-04.

Commit message

android: remove /system/lib prefix from lib path

On arm64, android system libs are placed under /system/lib64, not /system/lib. Since libhybris linker is already capable of looking up correct shared library file according to LD_LIBRARY_PATH or so, we should not hard code library full path anymore.

Description of the change

android: remove /system/lib prefix from lib path

On arm64, android system libs are placed under /system/lib64, not /system/lib. Since libhybris linker is already capable of looking up correct shared library file according to LD_LIBRARY_PATH or so, we should not hard code library full path anymore.

To post a comment you must log in.
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntu/application/touch/hybris/hybris_module.h'
2--- src/ubuntu/application/touch/hybris/hybris_module.h 2015-01-21 15:30:41 +0000
3+++ src/ubuntu/application/touch/hybris/hybris_module.h 2016-08-05 03:28:15 +0000
4@@ -38,7 +38,7 @@
5 {
6 static const char* path()
7 {
8- static const char* cache = "/system/lib/libubuntu_application_api.so";
9+ static const char* cache = "libubuntu_application_api.so";
10 return cache;
11 }
12
13
14=== modified file 'src/ubuntu/hardware/android_hw_module.h'
15--- src/ubuntu/hardware/android_hw_module.h 2016-01-26 13:37:51 +0000
16+++ src/ubuntu/hardware/android_hw_module.h 2016-08-05 03:28:15 +0000
17@@ -38,7 +38,7 @@
18 {
19 static const char* path()
20 {
21- static const char* cache = "/system/lib/libubuntu_application_api.so";
22+ static const char* cache = "libubuntu_application_api.so";
23 return cache;
24 }
25

Subscribers

People subscribed via source and target branches