diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
commit | 93d8a04231b180304eda74777bcf101715f2a1ee (patch) | |
tree | 16e88a8f8987269396579b660202378c04096c92 | |
parent | 2727f5ecc56e3535b1faba6c6c30a5c2a3772502 (diff) | |
parent | f35e56db0874bd24e16425921b6cf620ea75ae40 (diff) | |
download | tcpdump-93d8a04231b180304eda74777bcf101715f2a1ee.tar.gz |
Merge korg/donut into korg/master
-rw-r--r-- | Android.mk | 16 | ||||
-rw-r--r-- | config.h | 2 |
2 files changed, 10 insertions, 8 deletions
@@ -119,20 +119,22 @@ LOCAL_SRC_FILES:=\ missing/strlcat.c\ missing/strlcpy.c -LOCAL_CFLAGS:=-O2 -g -LOCAL_CFLAGS+=-DHAVE_CONFIG_H -D_U_="__attribute__((unused))" +LOCAL_CFLAGS := -O2 -g +LOCAL_CFLAGS += -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -LOCAL_C_INCLUDES+=\ +LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/missing\ external/openssl/include\ external/libpcap -LOCAL_SHARED_LIBRARIES+=libssl +LOCAL_SHARED_LIBRARIES += libssl -LOCAL_STATIC_LIBRARIES+=libpcap +LOCAL_STATIC_LIBRARIES += libpcap -LOCAL_MODULE_TAGS:=tests +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -LOCAL_MODULE:=tcpdump +LOCAL_MODULE_TAGS := eng + +LOCAL_MODULE := tcpdump include $(BUILD_EXECUTABLE) @@ -131,7 +131,7 @@ /* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */ /* define if should drop privileges by default */ -/* #undef WITH_USER */ +#define WITH_USER "shell" /* define if should chroot when dropping privileges */ /* #undef WITH_CHROOT */ |