commit 56b083c3dcdcd8eb7e57c0f22d1695d052803aeb
author Jiyong Park <jiyong@google.com> Wed Aug 04 12:48:09 2021 +0900
committer Jiyong Park <jiyong@google.com> Sun Aug 08 23:52:33 2021 +0000
tree 43913c44311f1174ae54253abb2a003eea9a0005
parent 586e2d7f866dc29dd2a3eaeb0a147d8ef9be2582

Remove ndk_platform backend. Use the ndk backend.

The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.

Bug: 161456198
Test: m
Change-Id: I13f719d6911f678e494b5177641c515c72b49906

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index ac5518d..757dcdc 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"],