Merge "Change AIDL module name"

2019-10-31 06:34:32 +00:00
parent f0cc2aa46f cc0b57ca06
commit 450a38b074
4 changed files with 4 additions and 4 deletions
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -6,7 +6,7 @@ java_library_static {
    ],
    static_libs: [
        "dnsresolver_aidl_interface-V2-java",
-        "netd_aidl_interface-java",
+        "netd_aidl_interface-unstable-java",
        "networkstack-client",
        "tethering-client",
    ],
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -74,7 +74,7 @@ android_test {
        "libui",
        "libunwindstack",
        "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
    ],

    dxflags: ["--multi-dex"],
--- a/services/tests/uiservicestests/Android.bp
+++ b/services/tests/uiservicestests/Android.bp
@@ -55,6 +55,6 @@ android_test {
        "libui",
        "libunwindstack",
        "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
    ],
 }
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -37,7 +37,7 @@ java_defaults {
        "libvndksupport",
        "libziparchive",
        "libz",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
    ],
 }