summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-11 12:25:11 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-11 12:25:11 +0000
commit6cb30e8244a39a1686d84d2a02eea3cc5c21fe61 (patch)
tree82dc47b28726912c8d1595c26bbf8a3de8dd805f
parent65e23f9fc46dd7c93185a3fbe4ee8bf356d3b232 (diff)
parent256a5b837db3c8ebc4580ba0f6494161f51b07b7 (diff)
downloadnetd-6cb30e8244a39a1686d84d2a02eea3cc5c21fe61.tar.gz
Snap for 7631994 from 256a5b837db3c8ebc4580ba0f6494161f51b07b7 to mainline-resolv-release
Change-Id: I9ceb6e2c3ad6146be9a7c757d7858b3387890301
-rw-r--r--server/Android.bp8
-rw-r--r--tests/benchmarks/Android.bp6
2 files changed, 7 insertions, 7 deletions
diff --git a/server/Android.bp b/server/Android.bp
index 9c89041a..784120be 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -23,9 +23,9 @@ java_library {
}
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 {
}
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",
diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index 00c28eb5..2aa8df0b 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -22,10 +22,10 @@ cc_benchmark {
],
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"],