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

Commit 6996b5dc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move bootclasspath dependency out of static_libs." am: e3719376 am:... 

Merge "Move bootclasspath dependency out of static_libs." am: e3719376 am: d7e77595 am: 64929aab

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1748033

Change-Id: Ia6ed3e448f992f9d03996cdcaa43603e509e53d7
parents 7dc34672 64929aab

testing/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -7,12 +7,15 @@ android_library { 


    srcs: ["**/*.java"],



    libs: [

        "telephony-common",

    ],



    static_libs: [

        "androidx.annotation_annotation",

        "guava",

        "junit",

        "mockito-target-minus-junit4",

        "telephony-common",

        "truth-prebuilt",

    ],

tests/telephonytests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ android_test { 
        "android.test.runner",

        "ims-common",

        "unsupportedappusage",

        "telephony-common",

    ],



    static_libs: [
@@ -32,7 +33,6 @@ android_test { 
        "platform-test-annotations",

        "services.core",

        "services.net",

        "telephony-common",

        "truth-prebuilt",

        "testables",

    ],