openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of e54d010 to oc-dev-plus-aosp 

Test: marlin-eng starts building
Change-Id: If65d8b015a88d41c4903354dc84c82d80f353c62
Merged-In: I562920373675552267ba201c07f4c9884f10d77a
This commit is contained in:
Lorenzo Colitti 2017-05-26 08:51:10 +09:00
parent 812aa6b61d e54d01029b
commit d832703640
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc/config/global.go
View File

@ -187,7 +187,7 @@ func VndkLibraries() []string {
// [vendor]
// namespace.default.link.system.shared_libs
func LLndkLibraries() []string {
return []string{"libc", "libm", "libdl", "liblog", "ld-android"}
return []string{"libc", "libm", "libdl", "liblog", "libandroid_net", "ld-android"}
}
func replaceFirst(slice []string, from, to string) {