2d954136fa
libbase doesn't have to rely on dlopen/dlsym to use liblog's new symbols
when it is built for __ANDROID_SDK_VERSION__ > 29.
Bug: 150860940
Test: TARGET_BUILD_APPS="com.android.adbd com.android.resolv" m
objdump -T ...shared_com.android.resolv/libbase.so | grep LIBLOG_R
=> should be none because resolv apex is targeting 29
objdump -T ...shared_com.android.adbd/libbase.so | grep LIBLOG_R
=> should list all new symbols because adbd apex is targeting R
objdump -T ...shared/libbase.so | grep LIBLOG_R
=> should list all new symbols
Merged-In: I7f7f16510d7637cd380fe35ea9ff3e804f38851d
Change-Id: I7f7f16510d7637cd380fe35ea9ff3e804f38851d
(cherry picked from commit 22207e6590)
89 lines
3 KiB
C++
89 lines
3 KiB
C++
/*
|
|
* Copyright (C) 2020 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 "liblog_symbols.h"
|
|
|
|
#if defined(__ANDROID_SDK_VERSION__) && (__ANDROID_SDK_VERSION__ <= 29)
|
|
#define USE_DLSYM
|
|
#endif
|
|
|
|
#ifdef USE_DLSYM
|
|
#include <dlfcn.h>
|
|
#endif
|
|
|
|
namespace android {
|
|
namespace base {
|
|
|
|
#ifdef USE_DLSYM
|
|
|
|
const std::optional<LibLogFunctions>& GetLibLogFunctions() {
|
|
static std::optional<LibLogFunctions> liblog_functions = []() -> std::optional<LibLogFunctions> {
|
|
void* liblog_handle = dlopen("liblog.so", RTLD_NOW);
|
|
if (liblog_handle == nullptr) {
|
|
return {};
|
|
}
|
|
|
|
LibLogFunctions real_liblog_functions = {};
|
|
|
|
#define DLSYM(name) \
|
|
real_liblog_functions.name = \
|
|
reinterpret_cast<decltype(LibLogFunctions::name)>(dlsym(liblog_handle, #name)); \
|
|
if (real_liblog_functions.name == nullptr) { \
|
|
return {}; \
|
|
}
|
|
|
|
DLSYM(__android_log_set_logger)
|
|
DLSYM(__android_log_write_logger_data)
|
|
DLSYM(__android_log_logd_logger)
|
|
DLSYM(__android_log_stderr_logger)
|
|
DLSYM(__android_log_set_aborter)
|
|
DLSYM(__android_log_call_aborter)
|
|
DLSYM(__android_log_default_aborter)
|
|
DLSYM(__android_log_set_minimum_priority);
|
|
DLSYM(__android_log_get_minimum_priority);
|
|
DLSYM(__android_log_set_default_tag);
|
|
#undef DLSYM
|
|
|
|
return real_liblog_functions;
|
|
}();
|
|
|
|
return liblog_functions;
|
|
}
|
|
|
|
#else
|
|
|
|
const std::optional<LibLogFunctions>& GetLibLogFunctions() {
|
|
static std::optional<LibLogFunctions> liblog_functions = []() -> std::optional<LibLogFunctions> {
|
|
return LibLogFunctions{
|
|
.__android_log_set_logger = __android_log_set_logger,
|
|
.__android_log_write_logger_data = __android_log_write_logger_data,
|
|
.__android_log_logd_logger = __android_log_logd_logger,
|
|
.__android_log_stderr_logger = __android_log_stderr_logger,
|
|
.__android_log_set_aborter = __android_log_set_aborter,
|
|
.__android_log_call_aborter = __android_log_call_aborter,
|
|
.__android_log_default_aborter = __android_log_default_aborter,
|
|
.__android_log_set_minimum_priority = __android_log_set_minimum_priority,
|
|
.__android_log_get_minimum_priority = __android_log_get_minimum_priority,
|
|
.__android_log_set_default_tag = __android_log_set_default_tag,
|
|
};
|
|
}();
|
|
return liblog_functions;
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace base
|
|
} // namespace android
|