commit 80618adc8757cdcbd4988c253119cf6bb7013a4f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 23 19:51:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 19:51:30 2023 +0000
tree b6a68a470207119649b43a5e4f018589f5ab0852
parent 0580b4fdf147be52cadb444e0bd5b7ffcd1e66b5
parent c1a0ce95263c00ab5e1ee9cc56cb252e4e921815

Merge "[automerger skipped] [automerge] Grant MANAGE_USERS access to Traceur 2p: f42db15239 am: 77f1d2a2ca -s ours am: 5725760416 -s ours am: b6ac32ca64 -s ours am: 575c485ca1 -s ours am: 0a2b74c553 -s ours" into tm-qpr-dev-plus-aosp

libs/hwui/Properties.cpp

diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 5a67eb9..738f1ab 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -98,7 +98,7 @@
     debugOverdraw = false;
     std::string debugOverdrawProperty = base::GetProperty(PROPERTY_DEBUG_OVERDRAW, "");
     if (debugOverdrawProperty != "") {
-        INIT_LOGD("  Overdraw debug enabled: %s", debugOverdrawProperty);
+        INIT_LOGD("  Overdraw debug enabled: %s", debugOverdrawProperty.c_str());
         if (debugOverdrawProperty == "show") {
             debugOverdraw = true;
             overdrawColorSet = OverdrawColorSet::Default;

packages/CtsShim/Android.bp

diff --git a/packages/CtsShim/Android.bp b/packages/CtsShim/Android.bp
index 31cd760..baafe7b 100644
--- a/packages/CtsShim/Android.bp
+++ b/packages/CtsShim/Android.bp
@@ -44,6 +44,9 @@
         arm64: {
             apk: "apk/arm/CtsShimPriv.apk",
         },
+        riscv64: {
+            apk: "apk/riscv64/CtsShimPriv.apk",
+        },
         x86: {
             apk: "apk/x86/CtsShimPriv.apk",
         },
@@ -82,6 +85,9 @@
         arm64: {
             apk: "apk/arm/CtsShim.apk",
         },
+        riscv64: {
+            apk: "apk/riscv64/CtsShim.apk",
+        },
         x86: {
             apk: "apk/x86/CtsShim.apk",
         },