commit 0c16dbe69078a0b121f22383764ae8e478af5d87
author Pawin Vongmasa <pawin@google.com> Mon Dec 16 04:25:41 2019 -0800
committer Pawin Vongmasa <pawin@google.com> Fri Dec 20 09:32:46 2019 +0000
tree e6f4f37e9ff690a8bc58301577f3176aac389787
parent 826e5c01ed7cf182009de09fc52ac1e250833540

RESTRICT AUTOMERGE mediaswcodec: Set "default" as preferred service

Usage mapper will be retrieved from the preferred service if system
properties for mediaswcodec's ION usage are not set.

Test: Define system property "ro.com.android.media.swcodec.ion.heapmask"
and check the log during the startup of mediaswcodec.

Test: Manually log the mapper activity; test if gets invoked from
mediaswcodec and CCodec.

Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 144995284
Change-Id: Iebcd89bfa38de3c10b79f878462ba2af347ad332

services/mediacodec/registrant/Android.bp

diff --git a/services/mediacodec/registrant/Android.bp b/services/mediacodec/registrant/Android.bp
index fa5bc4a..765ac99 100644
--- a/services/mediacodec/registrant/Android.bp
+++ b/services/mediacodec/registrant/Android.bp
@@ -14,6 +14,7 @@
         "libbase",
         "libcodec2_hidl@1.0",
         "libcodec2_vndk",
+        "libhidlbase",
         "libutils",
     ],