ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Require liblog for libbase in all configurations"

Browse source
This commit is contained in:
Tom Cherry 2020-01-15 23:20:07 +00:00 • committed by Gerrit Code Review
commit f633b62b63
5 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adb/Android.bp
View file

@ -217,6 +217,7 @@ cc_test_host {
"libcutils", "libcutils",
"libcrypto_utils", "libcrypto_utils",
"libcrypto", "libcrypto",
"liblog",
"libmdnssd", "libmdnssd",
"libdiagnose_usb", "libdiagnose_usb",
"libusb", "libusb",

2
base/include/android-base/logging.h
View file

@ -116,7 +116,6 @@ void DefaultAborter(const char* abort_message);
std::string GetDefaultTag(); std::string GetDefaultTag();
void SetDefaultTag(const std::string& tag); void SetDefaultTag(const std::string& tag);
#ifdef __ANDROID__
// We expose this even though it is the default because a user that wants to // We expose this even though it is the default because a user that wants to
// override the default log buffer will have to construct this themselves. // override the default log buffer will have to construct this themselves.
class LogdLogger { class LogdLogger {
@ -129,7 +128,6 @@ class LogdLogger {
private: private:
LogId default_log_id_; LogId default_log_id_;
}; };
#endif
// Configure logging based on ANDROID_LOG_TAGS environment variable. // Configure logging based on ANDROID_LOG_TAGS environment variable.
// We need to parse a string that looks like // We need to parse a string that looks like

4
base/logging.cpp
View file

@ -45,8 +45,8 @@
#include <vector> #include <vector>
// Headers for LogMessage::LogLine. // Headers for LogMessage::LogLine.
#ifdef __ANDROID__
#include <android/log.h> #include <android/log.h>
#ifdef __ANDROID__
#include <android/set_abort_message.h> #include <android/set_abort_message.h>
#else #else
#include <sys/types.h> #include <sys/types.h>
@ -242,7 +242,6 @@ void DefaultAborter(const char* abort_message) {
} }
#ifdef __ANDROID__
LogdLogger::LogdLogger(LogId default_log_id) : default_log_id_(default_log_id) { LogdLogger::LogdLogger(LogId default_log_id) : default_log_id_(default_log_id) {
} }
@ -276,7 +275,6 @@ void LogdLogger::operator()(LogId id, LogSeverity severity, const char* tag,
__android_log_buf_print(lg_id, priority, tag, "%s", message); __android_log_buf_print(lg_id, priority, tag, "%s", message);
} }
} }
#endif
void InitLogging(char* argv[], LogFunction&& logger, AbortFunction&& aborter) { void InitLogging(char* argv[], LogFunction&& logger, AbortFunction&& aborter) {
SetLogger(std::forward<LogFunction>(logger)); SetLogger(std::forward<LogFunction>(logger));

1
fs_mgr/libvbmeta/Android.bp
View file

@ -37,6 +37,7 @@ cc_library {
cc_test_host { cc_test_host {
name: "libvbmeta_test", name: "libvbmeta_test",
static_libs: [ static_libs: [
"liblog",
"libsparse", "libsparse",
"libvbmeta", "libvbmeta",
"libz", "libz",

1
property_service/property_info_checker/Android.bp
View file

@ -7,6 +7,7 @@ cc_binary {
"libpropertyinfoserializer", "libpropertyinfoserializer",
"libpropertyinfoparser", "libpropertyinfoparser",
"libbase", "libbase",
"liblog",
"libsepol", "libsepol",
], ],
srcs: ["property_info_checker.cpp"], srcs: ["property_info_checker.cpp"],