linker: remove /system/lib prefix from lib paths

NotKit · Aug 4, 2016 · cd5aacb · cd5aacb
1 parent f7dc8df
commit cd5aacb
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/hybris/camera/camera.c b/hybris/camera/camera.c
@@ -26,7 +26,7 @@
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 #include <hybris/surface_flinger/surface_flinger_compatibility_layer.h>
 
-#define COMPAT_LIBRARY_PATH "/system/lib/libcamera_compat_layer.so"
+#define COMPAT_LIBRARY_PATH "libcamera_compat_layer.so"
 
 HYBRIS_LIBRARY_INITIALIZE(camera, COMPAT_LIBRARY_PATH);
 

diff --git a/hybris/egl/platforms/null/eglplatform_null.c b/hybris/egl/platforms/null/eglplatform_null.c
@@ -16,7 +16,7 @@ static alloc_device_t *alloc = 0;
 
 static void _init_androidui()
 {
-       _libui = (void *) android_dlopen("/system/lib/libui.so", RTLD_LAZY);
+       _libui = (void *) android_dlopen("libui.so", RTLD_LAZY);
 }
 
 #define UI_DLSYM(fptr, sym) do { if (_libui == NULL) { _init_androidui(); }; if (*(fptr) == NULL) { *(fptr) = (void *) android_dlsym(_libui, sym); } } while (0) 

diff --git a/hybris/glesv1/glesv1_cm.c b/hybris/glesv1/glesv1_cm.c
@@ -26,7 +26,7 @@
 
 #include <hybris/common/binding.h>
 
-#define GLESV1_CM_LIBRARY_PATH "/system/lib/libGLESv1_CM.so"
+#define GLESV1_CM_LIBRARY_PATH "libGLESv1_CM.so"
 
 HYBRIS_LIBRARY_INITIALIZE(glesv1_cm, GLESV1_CM_LIBRARY_PATH);
 

diff --git a/hybris/input/is.c b/hybris/input/is.c
@@ -24,7 +24,7 @@
 #include <hybris/common/binding.h>
 #include <hybris/input/input_stack_compatibility_layer.h>
 
-#define COMPAT_LIBRARY_PATH "/system/lib/libis_compat_layer.so"
+#define COMPAT_LIBRARY_PATH "libis_compat_layer.so"
 
 HYBRIS_LIBRARY_INITIALIZE(is, COMPAT_LIBRARY_PATH);
 

diff --git a/hybris/libnfc_ndef_nxp/libnfc_ndef_nxp.c b/hybris/libnfc_ndef_nxp/libnfc_ndef_nxp.c
@@ -34,7 +34,7 @@
 
 #include <hybris/common/binding.h>
 
-HYBRIS_LIBRARY_INITIALIZE(libnfc_ndef_so, "/system/lib/libnfc_ndef.so");
+HYBRIS_LIBRARY_INITIALIZE(libnfc_ndef_so, "libnfc_ndef.so");
 
 HYBRIS_IMPLEMENT_FUNCTION5(libnfc_ndef_so, NFCSTATUS, phFriNfc_NdefRecord_GetRecords, uint8_t *, uint32_t, uint8_t **, uint8_t *, uint32_t *);
 HYBRIS_IMPLEMENT_FUNCTION1(libnfc_ndef_so, uint32_t, phFriNfc_NdefRecord_GetLength, phFriNfc_NdefRecord_t *);

diff --git a/hybris/libnfc_nxp/libnfc_nxp.c b/hybris/libnfc_nxp/libnfc_nxp.c
@@ -56,7 +56,7 @@ typedef void   (*pphDal4Nfc_DeferFuncPointer_t) (void * );
 
 #include <hybris/common/binding.h>
 
-HYBRIS_LIBRARY_INITIALIZE(libnfc_so, "/system/lib/libnfc.so");
+HYBRIS_LIBRARY_INITIALIZE(libnfc_so, "libnfc.so");
 
 HYBRIS_IMPLEMENT_FUNCTION2(libnfc_so, NFCSTATUS, phLibNfc_Mgt_ConfigureDriver, pphLibNfc_sConfig_t, void **);
 HYBRIS_IMPLEMENT_FUNCTION2(libnfc_so, NFCSTATUS, phDal4Nfc_Config, pphDal4Nfc_sConfig_t, void **);

diff --git a/hybris/media/media.c b/hybris/media/media.c
@@ -33,7 +33,7 @@
 #include <hybris/media/media_codec_source_layer.h>
 #include <hybris/media/media_buffer_layer.h>
 
-#define COMPAT_LIBRARY_PATH "/system/lib/libmedia_compat_layer.so"
+#define COMPAT_LIBRARY_PATH "libmedia_compat_layer.so"
 
 #ifdef __ARM_PCS_VFP
 #define FP_ATTRIB __attribute__((pcs("aapcs")))

diff --git a/hybris/sf/sf.c b/hybris/sf/sf.c
@@ -24,7 +24,7 @@
 #include <hybris/common/binding.h>
 #include <hybris/surface_flinger/surface_flinger_compatibility_layer.h>
 
-#define COMPAT_LIBRARY_PATH "/system/lib/libsf_compat_layer.so"
+#define COMPAT_LIBRARY_PATH "libsf_compat_layer.so"
 
 HYBRIS_LIBRARY_INITIALIZE(sf, COMPAT_LIBRARY_PATH);
 

diff --git a/hybris/ui/ui.c b/hybris/ui/ui.c
@@ -20,7 +20,7 @@
 #include <hybris/common/binding.h>
 #include <hybris/ui/ui_compatibility_layer.h>
 
-#define COMPAT_LIBRARY_PATH		"/system/lib/libui_compat_layer.so"
+#define COMPAT_LIBRARY_PATH		"libui_compat_layer.so"
 
 HYBRIS_LIBRARY_INITIALIZE(ui, COMPAT_LIBRARY_PATH);
 

diff --git a/hybris/vibrator/vibrator.c b/hybris/vibrator/vibrator.c
@@ -22,7 +22,7 @@
 
 #include <hybris/common/binding.h>
 
-HYBRIS_LIBRARY_INITIALIZE(vibrator, "/system/lib/libhardware_legacy.so");
+HYBRIS_LIBRARY_INITIALIZE(vibrator, "libhardware_legacy.so");
 
 HYBRIS_IMPLEMENT_FUNCTION0(vibrator, int, vibrator_exists);
 HYBRIS_IMPLEMENT_FUNCTION1(vibrator, int, vibrator_on, int);

diff --git a/hybris/wifi/wifi.c b/hybris/wifi/wifi.c
@@ -22,7 +22,7 @@
 #include <hybris/common/binding.h>
 #include <hardware_legacy/wifi.h>
 
-#define COMPAT_LIBRARY_PATH "/system/lib/libhardware_legacy.so"
+#define COMPAT_LIBRARY_PATH "libhardware_legacy.so"
 
 HYBRIS_LIBRARY_INITIALIZE(wifi, COMPAT_LIBRARY_PATH);