Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4209b614 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes Ia11dffde,I76f24890 am: bd53ea40 am: 280e3bee am: 5d29c3f3 

am: 63d7c1e9

Change-Id: I7149be8db6f5339a408889157af330c2ba5ecc6c
parents 206f8732 63d7c1e9

base/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -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,

libnetutils/Android.bp

0 → 100644
+19 −0
Original line number Diff line number Diff line 
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"],

}

libnetutils/Android.mk

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
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)