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

Commit fabe2f9c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Remi NGUYEN VAN
Browse files

Properly use versioned interfaces. 

Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \; \
    | grep -v oemnetd | grep -v tests/

Test: m
Bug: 133124190
(cherry-pick from aosp/968011)
Merged-In: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
(cherry picked from commit 433f7c4178aaadac7d6a5f6727f39ef83342d436)

Change-Id: I77e2291b52fda24ee01e1b22ddafe4fe7368959e
parent 57d6a45d

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",