commit 0a7c785ed680ec296d42a95fcf9a06937bfaa5aa
author Xin Li <delphij@google.com> Wed Aug 18 00:23:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 18 00:23:56 2021 +0000
tree 9b9b0c8c23ccb7358275d06ec0375f7a2723cfdf
parent 5d98761ef9cb3ecd215ad119e2df3a7be0e43b8b
parent ff7ee3bd513c193f22302b9b8829b608cd2f1cf7

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1051a3edb9 -s ours am: bcd7412ae9 -s ours am: 019101e1c7 -s ours am: ff7ee3bd51 -s ours

am skip reason: Merged-In I73faf2fdc96ed47d3ab85855155ac7bd25925776 with SHA-1 02ef8fbfe5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/audio/+/15571703

Change-Id: I191372807419cd85227d943aed5ac23d2a597440

OWNERS

diff --git a/OWNERS b/OWNERS
index d65f614..15bc50d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,5 @@
 # Default code reviewers picked from top 3 or more developers.
 # Please update this list if you find better candidates.
 hunga@google.com
-krocard@google.com
+mnaganov@google.com
 elaurent@google.com

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index fcd1992..b9b64b1 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -226,7 +226,7 @@
 
 LOCAL_SHARED_LIBRARIES += libbase libhidlbase libutils android.hardware.power@1.2 liblog
 
-LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform
+LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk
 LOCAL_SHARED_LIBRARIES += libbinder_ndk
 
 LOCAL_SRC_FILES += audio_perf.cpp