7a1d8a10a8
Instead of looking up default namespace for the failure of loading
sphal libs, report failure. This is only for the devices that have
sphal namespace.
Bug: 38435840
Test: sailfish builds and boots
Test: libvndksupport-tests passes
Change-Id: Ibbff5f2d5d83f6482f98677a5492777db6416967
Merged-In: Ibbff5f2d5d83f6482f98677a5492777db6416967
(cherry picked from commit 17baed1012
)
46 lines
1.6 KiB
C
46 lines
1.6 KiB
C
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include "linker.h"
|
|
|
|
#include <android/dlext.h>
|
|
#include <dlfcn.h>
|
|
|
|
#define LOG_TAG "vndksupport"
|
|
#include <log/log.h>
|
|
|
|
extern struct android_namespace_t* android_get_exported_namespace(const char*);
|
|
|
|
void* android_load_sphal_library(const char* name, int flag) {
|
|
struct android_namespace_t* sphal_namespace = android_get_exported_namespace("sphal");
|
|
if (sphal_namespace != NULL) {
|
|
const android_dlextinfo dlextinfo = {
|
|
.flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = sphal_namespace,
|
|
};
|
|
void* handle = android_dlopen_ext(name, flag, &dlextinfo);
|
|
if (!handle) {
|
|
ALOGE("Could not load %s from sphal namespace: %s.", name, dlerror());
|
|
}
|
|
return handle;
|
|
} else {
|
|
ALOGI(
|
|
"sphal namespace is not configured for this process. "
|
|
"Loading %s from the current namespace instead.",
|
|
name);
|
|
return dlopen(name, flag);
|
|
}
|
|
}
|
|
|
|
int android_unload_sphal_library(void* handle) { return dlclose(handle); }
|