commit 53aca9a46b02bed3cc7037e0a9bf5df4488ee89f
author Alan Stokes <alanstokes@google.com> Wed Feb 01 16:46:13 2023 +0000
committer Alan Stokes <alanstokes@google.com> Thu Feb 02 11:34:19 2023 +0000
tree 3dc1c90b4db182a9c330b59caf2790b5b293826c
parent d265a80f863484a93ca1826bf490cbaa99ee85ed

Don't use logd in Microdroid

Logd isn't supported; instead the default logging uses a file
logger. Detect this and leave it alone.

Bug: 264496291
Bug: 265153235
Test: atest android.compos.test.ComposTestCase#testOdrefreshSpeed
Change-Id: Ib98c06fe41c2362b87582833f879750ec3d99aae

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index f205565..e6c3d3c 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -1033,7 +1033,13 @@
     original_argv = argv;
 
     Locks::Init();
-    InitLogging(argv, Runtime::Abort);
+
+    // Microdroid doesn't support logd logging, so don't override there.
+    if (android::base::GetProperty("ro.hardware", "") == "microdroid") {
+      android::base::SetAborter(Runtime::Abort);
+    } else {
+      InitLogging(argv, Runtime::Abort);
+    }
 
     compiler_options_.reset(new CompilerOptions());