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

Commit 5fcfca0c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp 

* changes:
  Merge changes from topic 'multinetwork_vndk' into oc-dev am: cffee96a
  Move libandroid_net from Android.mk to Android.bp. am: addb2962  -s ours
parents 69230286 e1c426f5

native/android/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -87,3 +87,10 @@ cc_library_shared { 


    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/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:

    *;

};