commit 71dad745ddbbf86fb6c1722564618ab7056c4cb1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 27 06:21:34 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 27 06:21:34 2021 +0000
tree 82dc47b28726912c8d1595c26bbf8a3de8dd805f
parent 555b76613d3158b6739f45c6d7cd664d2da93ff5
parent c14fd857ca6e357af1489d3c57a692c489c5451d

Snap for 7679530 from c14fd857ca6e357af1489d3c57a692c489c5451d to mainline-extservices-release

Change-Id: If508445d0d12a9ca56f13110cf858dd89c10c413

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index 9c89041..784120b 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -23,9 +23,9 @@
 }
 
 cc_library_static {
-    name: "netd_event_listener_interface-lateststable-ndk_platform",
+    name: "netd_event_listener_interface-lateststable-ndk",
     whole_static_libs: [
-        "netd_event_listener_interface-V1-ndk_platform",
+        "netd_event_listener_interface-V1-ndk",
     ],
     apex_available: [
         "com.android.resolv",
@@ -34,9 +34,9 @@
 }
 
 cc_library_static {
-    name: "netd_aidl_interface-lateststable-ndk_platform",
+    name: "netd_aidl_interface-lateststable-ndk",
     whole_static_libs: [
-        "netd_aidl_interface-V7-ndk_platform",
+        "netd_aidl_interface-V7-ndk",
     ],
     apex_available: [
         "com.android.resolv",

tests/benchmarks/Android.bp

diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index 00c28eb..2aa8df0 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -22,10 +22,10 @@
     ],
     static_libs: [
         "libnetd_test_dnsresponder_ndk",
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "netd_aidl_interface-lateststable-cpp", //  system/netd/server/UidRanges.h
-        "netd_aidl_interface-lateststable-ndk_platform",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk",
+        "netd_event_listener_interface-lateststable-ndk",
     ],
     aidl: {
         include_dirs: ["system/netd/server/binder"],