Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-libhardware: Commit

hardware/libhardware


Commit MetaInfo

Révisiond5e1f8a543f8f7364e8c7a0ca7c74310ac35b945 (tree)
l'heure2017-06-01 16:15:06
Auteurandroid-build-team Robot <android-build-team-robot@goog...>
Commiterandroid-build-team Robot

Message de Log

release-request-18270495-77c6-4d95-8968-eb22e3d2fe8b-for-git_oc-release-4057656 snap-temp-L93200000069424216

Change-Id: Ia550b92ea7680c3616a4e634832b0cc267eda6be

Change Summary

Modification

--- a/hardware.c
+++ b/hardware.c
@@ -82,7 +82,14 @@ static int load(const char *id,
8282 * dlopen returns. Since RTLD_GLOBAL is not or'd in with
8383 * RTLD_NOW the external symbols will not be global
8484 */
85- handle = android_load_sphal_library(path, RTLD_NOW);
85+ if (strncmp(path, "/system/", 8) == 0) {
86+ /* If the library is in system partition, no need to check
87+ * sphal namespace. Open it with dlopen.
88+ */
89+ handle = dlopen(path, RTLD_NOW);
90+ } else {
91+ handle = android_load_sphal_library(path, RTLD_NOW);
92+ }
8693 if (handle == NULL) {
8794 char const *err_str = dlerror();
8895 ALOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
Afficher sur ancien navigateur de dépôt.