From 8637fb888a38fe87e8f387fe7fd6f6c0367c3707 Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Tue, 31 Oct 2023 14:15:53 +0000 Subject: Cherry-pick MediaFrameworkTest dep changes from internal main This resolves automerge conflicts in aosp/2745223 This is a manual cherry-pick of aosp/2796172 with different automerger tags (see comment: https://android-review.git.corp.google.com/c/platform/frameworks/base/+/2796172/comments/f84931d5_488e9082). Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest Bug: 298965955 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:54342761f0739a209d46938a0e956ab71c15d980) Merged-In: I8cb92fd35b3633cf458f8692173124fd1666d6b5 Change-Id: I8cb92fd35b3633cf458f8692173124fd1666d6b5 --- media/tests/MediaFrameworkTest/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media/tests/MediaFrameworkTest/Android.bp b/media/tests/MediaFrameworkTest/Android.bp index 06ec949e6736..bdd7afeb2f65 100644 --- a/media/tests/MediaFrameworkTest/Android.bp +++ b/media/tests/MediaFrameworkTest/Android.bp @@ -20,7 +20,9 @@ android_test { "androidx.test.ext.junit", "androidx.test.rules", "android-ex-camera2", + "testables", "testng", + "truth", ], jni_libs: [ "libdexmakerjvmtiagent", -- cgit v1.2.3-59-g8ed1b