Merge changes Ia11dffde,I76f24890
* changes: Convert libnetutils to Android.bp Don't export libutils_headers from libbase
This commit is contained in:
commit
bd53ea4063
|
@ -26,9 +26,6 @@ cc_library_headers {
|
|||
host_supported: true,
|
||||
export_include_dirs: ["include"],
|
||||
|
||||
header_libs: ["libutils_headers"],
|
||||
export_header_lib_headers: ["libutils_headers"],
|
||||
|
||||
target: {
|
||||
linux_bionic: {
|
||||
enabled: true,
|
||||
|
@ -54,7 +51,10 @@ cc_library {
|
|||
"test_utils.cpp",
|
||||
],
|
||||
|
||||
header_libs: ["libbase_headers"],
|
||||
header_libs: [
|
||||
"libbase_headers",
|
||||
"libutils_headers",
|
||||
],
|
||||
export_header_lib_headers: ["libbase_headers"],
|
||||
|
||||
cppflags: libbase_cppflags,
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
cc_library_shared {
|
||||
name: "libnetutils",
|
||||
|
||||
srcs: [
|
||||
"dhcpclient.c",
|
||||
"dhcpmsg.c",
|
||||
"ifc_utils.c",
|
||||
"packet.c",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libcutils",
|
||||
"liblog",
|
||||
],
|
||||
|
||||
cflags: ["-Werror"],
|
||||
|
||||
export_include_dirs: ["include"],
|
||||
}
|
|
@ -1,21 +0,0 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
dhcpclient.c \
|
||||
dhcpmsg.c \
|
||||
ifc_utils.c \
|
||||
packet.c
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
liblog
|
||||
|
||||
LOCAL_MODULE := libnetutils
|
||||
|
||||
LOCAL_CFLAGS := -Werror
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
Loading…
Reference in New Issue