generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 564222e3: Merge "Use default hidden visibility to build libc_dns."

Browse Source 
* commit '564222e3384eb1c649bc75650deb847c40ec7da3':
  Use default hidden visibility to build libc_dns.
This commit is contained in:
Elliott Hughes 2014-06-13 00:44:36 +00:00 committed by Android Git Automerger
commit c189362d87
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/Android.mk
View File

@ -273,8 +273,6 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/lib/libc/gen/psignal.c \
upstream-netbsd/lib/libc/gen/utime.c \
upstream-netbsd/lib/libc/gen/utmp.c \
upstream-netbsd/lib/libc/isc/ev_streams.c \
upstream-netbsd/lib/libc/isc/ev_timers.c \
upstream-netbsd/lib/libc/regex/regcomp.c \
upstream-netbsd/lib/libc/regex/regerror.c \
upstream-netbsd/lib/libc/regex/regexec.c \
@ -619,15 +617,21 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-c-files-under,dns)
LOCAL_SRC_FILES := \
$(call all-c-files-under,dns) \
upstream-netbsd/lib/libc/isc/ev_streams.c \
upstream-netbsd/lib/libc/isc/ev_timers.c \
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DANDROID_CHANGES \
-DINET6 \
-fvisibility=hidden \
-I$(LOCAL_PATH)/dns/include \
-I$(LOCAL_PATH)/private \
-I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \
-include upstream-netbsd/android/include/netbsd-compat.h \
-I$(LOCAL_PATH)/upstream-netbsd/android/include \
-include netbsd-compat.h \
# -Werror \
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)

20
libc/dns/include/resolv_netid.h
View File

@ -50,20 +50,24 @@ __BEGIN_DECLS
struct addrinfo;
struct hostent *android_gethostbyaddrfornet(const void *, socklen_t, int, unsigned, unsigned);
struct hostent *android_gethostbyaddrfornet_proxy(const void *, socklen_t, int , unsigned);
struct hostent *android_gethostbynamefornet(const char *, int, unsigned, unsigned);
#define __used_in_netd __attribute__((visibility ("default")))
struct hostent *android_gethostbyaddrfornet(const void *, socklen_t, int, unsigned, unsigned) __used_in_netd;
struct hostent *android_gethostbynamefornet(const char *, int, unsigned, unsigned) __used_in_netd;
int android_getaddrinfofornet(const char *, const char *, const struct addrinfo *, unsigned,
unsigned, struct addrinfo **);
int android_getnameinfofornet(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t,
int, unsigned, unsigned);
unsigned, struct addrinfo **) __used_in_netd;
/* set name servers for a network */
extern void _resolv_set_nameservers_for_net(unsigned netid,
const char** servers, int numservers, const char *domains);
const char** servers, int numservers, const char *domains) __used_in_netd;
/* flush the cache associated with a certain network */
extern void _resolv_flush_cache_for_net(unsigned netid);
extern void _resolv_flush_cache_for_net(unsigned netid) __used_in_netd;
/* Internal use only. */
struct hostent *android_gethostbyaddrfornet_proxy(const void *, socklen_t, int , unsigned);
int android_getnameinfofornet(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t,
int, unsigned, unsigned);
__END_DECLS

3
libc/include/netdb.h
View File

@ -196,6 +196,8 @@ struct addrinfo {
#define SCOPE_DELIMITER '%'
__BEGIN_DECLS
#pragma GCC visibility push(default)
/* BIONIC-BEGIN */
#define h_errno (*__get_h_errno())
int* __get_h_errno(void);
@ -245,6 +247,7 @@ const char *gai_strerror(int);
void setnetgrent(const char *);
void setservent(int);
#pragma GCC visibility pop
__END_DECLS
#endif /* !_NETDB_H_ */

2
libc/include/resolv.h
View File

@ -37,6 +37,7 @@
#include <netinet/in.h>
__BEGIN_DECLS
#pragma GCC visibility push(default)
struct res_state;
@ -52,6 +53,7 @@ extern int b64_pton(char const*, u_char*, size_t);
extern int dn_comp(const char*, u_char*, int, u_char**, u_char**);
extern int dn_expand(const u_char*, const u_char*, const u_char*, char*, int);
#pragma GCC visibility pop
__END_DECLS
#endif /* _RESOLV_H_ */