Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8637fb88 authored by Ian Baker's avatar Ian Baker Committed by Cherrypicker Worker
Browse files

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
parent 0792d99b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ android_test {
        "androidx.test.ext.junit",
        "androidx.test.rules",
        "android-ex-camera2",
        "testables",
        "testng",
        "truth",
    ],
    jni_libs: [
        "libdexmakerjvmtiagent",