commit 3a989797f072274e3c4a460813c79fe06382b000
author Nataniel Borges <natanieljr@google.com> Thu Feb 23 14:04:46 2023 +0000
committer Nataniel Borges <natanieljr@google.com> Fri Feb 24 10:28:28 2023 +0000
tree fc06fd04b900a75741f2331cce0c65b9bf4ccb08
parent 189d4f924b7fb1689abf19747808fc718887b173

[DO NOT MERGE] Compatibilize UDC dev to master

This is a marge of all CLs from

https://googleplex-android-review.git.corp.google.com/q/topic:%22flicker-ir%22

Test: atest FlickerLibTests
Bug: 262369733
Change-Id: I563ce33a9acac70cf4ffc2ad6a5c12fce4506987

tests/FlickerTests/Android.bp

diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp
index 855d3c1..fef5211 100644
--- a/tests/FlickerTests/Android.bp
+++ b/tests/FlickerTests/Android.bp
@@ -42,6 +42,8 @@
         "androidx.test.ext.junit",
         "flickertestapplib",
         "flickerlib",
+        "flickerlib-apphelpers",
+        "flickerlib-helpers",
         "truth-prebuilt",
         "launcher-helper-lib",
         "launcher-aosp-tapl",
@@ -65,6 +67,7 @@
     ],
     static_libs: [
         "flickerlib",
+        "flickerlib-helpers",
         "truth-prebuilt",
         "app-helpers-core",
     ],
@@ -80,8 +83,10 @@
         "**/helpers/*",
     ],
     static_libs: [
-        "flickerlib",
         "flickertestapplib",
+        "flickerlib",
+        "flickerlib-apphelpers",
+        "flickerlib-helpers",
         "truth-prebuilt",
         "app-helpers-core",
         "wm-flicker-window-extensions",