summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Chen <cken@google.com>2022-04-24 04:18:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-24 04:18:37 +0000
commit7cec56b143bed8d80dc59a49e4a192f2d9fde082 (patch)
tree839bd20fbc39b30faa9eef865b505a96721aaa8c
parent6f3baa629e26bc3bd3086090877c1bce4fd9cb00 (diff)
parent0add4ba73536c8675e486c0395f27af62eb263c8 (diff)
downloadnet-7cec56b143bed8d80dc59a49e4a192f2d9fde082.tar.gz
Merge "Add wrappers for the latest stable version of netd_aidl_interface-V*-cpp" am: 0add4ba735
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2068868 Change-Id: I571d83f548d492cef6c4e52fa9499a5ddf573255 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/netd/Android.bp11
1 files changed, 11 insertions, 0 deletions
diff --git a/common/netd/Android.bp b/common/netd/Android.bp
index 85a756c7..6bc7c014 100644
--- a/common/netd/Android.bp
+++ b/common/netd/Android.bp
@@ -53,6 +53,7 @@ cc_library_static {
min_sdk_version: "29",
}
+// TODO: delete this one when AOSP is no longer auto-merge to git_sc-mainline-prod.
cc_library_static {
name: "netd_aidl_interface-lateststable-cpp",
whole_static_libs: [
@@ -60,6 +61,16 @@ cc_library_static {
],
}
+cc_defaults {
+ name: "netd_aidl_interface_lateststable_cpp_static",
+ static_libs: ["netd_aidl_interface-V8-cpp"],
+}
+
+cc_defaults {
+ name: "netd_aidl_interface_lateststable_cpp_shared",
+ shared_libs: ["netd_aidl_interface-V8-cpp"],
+}
+
aidl_interface {
name: "netd_aidl_interface",
local_include_dir: "binder",