Merge "Don't pass same argument twice for defaults modules initialization"
am: 25167cdc7a
Change-Id: I46a2d77a2bb5f6597cc98eaffaa3f2f59ce21209
diff --git a/android/variable.go b/android/variable.go
index 8462d0d..77bdda2 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -81,6 +81,7 @@
Debuggable struct {
Cflags []string
Cppflags []string
+ Init_rc []string
}
// eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging
diff --git a/cc/config/global.go b/cc/config/global.go
index f4a1230..2196ef2 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -193,7 +193,7 @@
// [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) {