summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeongik Cha <jeongik@google.com> 2019-10-31 00:00:11 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-31 00:00:11 -0700
commitb7732c191a6650c1d71309ff95cf327149fc9bf9 (patch)
tree3db69b9b32047ebcc0107107aade8c5c7351c169
parent1adc2322686404722309d945d3d15cad6e4adab3 (diff)
parent432fb0358bed649748cb41c25a46eacacdcc874c (diff)
Merge "Change AIDL module name" am: 450a38b074
am: 432fb0358b Change-Id: Ib67d2e7f95592b2b94b43001f89a9413ff01dfcd
-rw-r--r--services/net/Android.bp2
-rw-r--r--services/tests/servicestests/Android.bp2
-rw-r--r--services/tests/uiservicestests/Android.bp2
-rw-r--r--tests/net/Android.bp2
4 files changed, 4 insertions, 4 deletions
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 08cdbfc55cfe..2ab8189150de 100644
--- 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",
],
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index ecddeb3dda61..eecdeed2cd25 100644
--- 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"],
diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp
index 4a9cef1f1cbd..92198fa8cb0c 100644
--- 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",
],
}
diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index b9b2238572ac..10f27e243c8c 100644
--- 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",
],
}