commit 3f72612578d4e4a87e4697dffe69be06a98b2d1a
author Patrick Rohr <prohr@google.com> Mon Nov 29 21:44:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 29 21:44:50 2021 +0000
tree da321b2e2c76a7b502e7e49d6160b80b085538c5
parent 100465999d1f9ba13a75a3a8f7c186f53248a3c0
parent 892366fe60043b4a8e2a9bfac95f4d7de231202a

Merge changes I9fb4e87e,Id018c33c,I5b6bdb3b

* changes:
  fix tuner filter callback scheduler
  fix filter event creation
  fix mFilterEvents locking

graphics/composer/2.2/utils/vts/Android.bp

diff --git a/graphics/composer/2.2/utils/vts/Android.bp b/graphics/composer/2.2/utils/vts/Android.bp
index 51295a6..4faf84b 100644
--- a/graphics/composer/2.2/utils/vts/Android.bp
+++ b/graphics/composer/2.2/utils/vts/Android.bp
@@ -43,6 +43,7 @@
         "libmath",
         "libnativewindow",
         "librenderengine",
+        "libshaders",
         "libtonemap",
         "android.hardware.graphics.mapper@3.0",
         "android.hardware.graphics.mapper@3.0-vts",

graphics/composer/2.2/vts/functional/Android.bp

diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp
index 79ed368..1e0a329 100644
--- a/graphics/composer/2.2/vts/functional/Android.bp
+++ b/graphics/composer/2.2/vts/functional/Android.bp
@@ -67,6 +67,7 @@
         "android.hardware.graphics.mapper@4.0-vts",
         "libgtest",
         "librenderengine",
+        "libshaders",
         "libtonemap",
     ],
     header_libs: [