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

Commit cffee96a authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'multinetwork_vndk' into oc-dev 

* changes:
  Allow vendor code to link to libandroid_net.
  Move libandroid_net from Android.mk to Android.bp.
parents cca181bf ec37d5f6

native/android/Android.bp

+28 −0
Original line number Diff line number Diff line
@@ -19,3 +19,31 @@ ndk_library { 
    first_version: "9",

    unversioned_until: "current",

}



cc_defaults {

    name: "libandroid_defaults",

    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}



// Network library.

cc_library_shared {

    name: "libandroid_net",

    defaults: ["libandroid_defaults"],

    srcs: ["net.c"],



    shared_libs: ["libnetd_client"],



    include_dirs: ["bionic/libc/dns/include"],

}



llndk_library {

    name: "libandroid_net",

    export_include_dirs: ["include"],

    symbol_file: "libandroid_net.map.txt",

    unversioned: true,

}

native/android/Android.mk

+0 −17
Original line number Diff line number Diff line
@@ -58,20 +58,3 @@ LOCAL_MODULE := libandroid 
LOCAL_CFLAGS += $(common_cflags)



include $(BUILD_SHARED_LIBRARY)
 


# Network library.

include $(CLEAR_VARS)

LOCAL_MODULE := libandroid_net

LOCAL_CFLAGS := $(common_cflags)

LOCAL_SRC_FILES:= \

    net.c \



LOCAL_SHARED_LIBRARIES := \

    libnetd_client \



LOCAL_C_INCLUDES += \

    frameworks/base/native/include \

    bionic/libc/dns/include \

    system/netd/include \



include $(BUILD_SHARED_LIBRARY)

native/android/include/multinetwork.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../../native/include/android/multinetwork.h
 
 No newline at end of file

native/android/libandroid_net.map.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# These functions have been part of the NDK since API 24.

# They are also all available to vendor code.

LIBANDROID_NET {

  global:

    android_setsocknetwork; # vndk

    android_setprocnetwork; # vndk

    android_getaddrinfofornetwork; # vndk

  local:

    *;

};