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

Commit 77afd74e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am:... 

Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp am: 5b992330bb" into qt-r1-dev-plus-aosp
am: b010e1210b

Change-Id: Id816e44f87d644e2c8b0e41b860fac7fd4305fed
parents 8f33a0d3 b1b2eca3

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ android_library { 
    static_libs: [

        "androidx.annotation_annotation",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "networkstack-aidl-interfaces-java",

        "netd_aidl_interface-V2-java",

        "networkstack-aidl-interfaces-V3-java",

        "datastallprotosnano",

        "networkstackprotosnano",

        "captiveportal-lib",

tests/unit/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ android_test { 
        "libutilscallstack",

        "libziparchive",

        "libz",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

}
@@ -94,7 +94,7 @@ cc_library_shared { 
        "liblog",

        "libcutils",

        "libnativehelper",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    static_libs: [

        "libapf",