Merge "logd: read Trusty log"
diff --git a/liblog/Android.bp b/liblog/Android.bp
index bf89903..4dd6dd3 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -158,10 +158,7 @@
"com.android.runtime",
// DO NOT add more apex names here
],
- pgo: {
- sampling: true,
- profile_file: "logging/liblog.profdata",
- },
+ afdo: true,
}
ndk_headers {
diff --git a/liblog/tests/log_wrap_test.cpp b/liblog/tests/log_wrap_test.cpp
index 755898a..4288ead 100644
--- a/liblog/tests/log_wrap_test.cpp
+++ b/liblog/tests/log_wrap_test.cpp
@@ -33,8 +33,7 @@
// Read the last line in the log to get a starting timestamp. We're assuming
// the log is not empty.
const int mode = ANDROID_LOG_NONBLOCK;
- struct logger_list* logger_list =
- android_logger_list_open(LOG_ID_MAIN, mode, 1000, 0);
+ struct logger_list* logger_list = android_logger_list_open(LOG_ID_SYSTEM, mode, 1000, 0);
ASSERT_NE(logger_list, nullptr);
@@ -49,8 +48,7 @@
logger_list =
android_logger_list_alloc_time(mode | ANDROID_LOG_WRAP, start, 0);
ASSERT_NE(logger_list, nullptr);
-
- struct logger* logger = android_logger_open(logger_list, LOG_ID_MAIN);
+ struct logger* logger = android_logger_open(logger_list, LOG_ID_SYSTEM);
EXPECT_NE(logger, nullptr);
if (logger) {
android_logger_list_read(logger_list, &log_msg);
diff --git a/rust/Android.bp b/rust/Android.bp
index 21162b4..61f7d04 100644
--- a/rust/Android.bp
+++ b/rust/Android.bp
@@ -11,6 +11,7 @@
"libenv_logger",
"liblog_rust",
],
+ vendor_available: true,
target: {
android: {
rustlibs: [
