Use stubs generated by build system
instead of hand-crafted stub for libnetd_resolv apex.
This change doesn't affect to the Q-device compatibility because netd on
Q device can still the hand-crafted stub for libnetd_resolv.so and the
shared library is not changed.
Bug: N/A
Test: m && flash && boot
Test: adb shell ldd /system/bin/netd # shows libnetd_resolv.so from apex
Change-Id: I185b36e76b4eb57aa8a7954161b2f7fbccfd8b80
diff --git a/Android.bp b/Android.bp
index b7e49ac..ce1178a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,6 +38,12 @@
cc_library {
name: "libnetd_resolv",
version_script: "libnetd_resolv.map.txt",
+ stubs: {
+ versions: [
+ "1",
+ ],
+ symbol_file: "libnetd_resolv.map.txt",
+ },
defaults: ["netd_defaults"],
srcs: [
"getaddrinfo.cpp",
diff --git a/include/netd_resolv/resolv_stub.h b/include/netd_resolv/resolv_stub.h
deleted file mode 100644
index 52ddf75..0000000
--- a/include/netd_resolv/resolv_stub.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "resolv.h"
-
-// Struct containing function pointers for every function exported by libnetd_resolv.
-extern struct ResolvStub {
- bool (*resolv_has_nameservers)(unsigned netid);
-
- bool (*resolv_init)(const ResolverNetdCallbacks& callbacks);
-
- bool (*resolv_gethostbyaddr_from_cache)(unsigned netId, char domain_name[],
- size_t domain_name_size, const char* ip_address,
- int af);
-} RESOLV_STUB;
-
-int resolv_stub_init();