Merge "Move dlerror out of a TLS slot and into a pthread_internal_t member."
diff --git a/libc/Android.bp b/libc/Android.bp
index c34cd85..0098d07 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1478,6 +1478,39 @@
name: "libc_malloc",
}
+filegroup {
+ name: "libc_sources_shared",
+ srcs: [
+ "arch-common/bionic/crtbegin_so.c",
+ "arch-common/bionic/crtbrand.S",
+ "bionic/icu.cpp",
+ "bionic/malloc_common.cpp",
+ "bionic/NetdClient.cpp",
+ "arch-common/bionic/crtend_so.S",
+ ],
+}
+
+filegroup {
+ name: "libc_sources_static",
+ srcs: [
+ "bionic/dl_iterate_phdr_static.cpp",
+ "bionic/malloc_common.cpp",
+ ],
+}
+
+filegroup {
+ name: "libc_sources_shared_arm",
+ srcs: [
+ "arch-arm/bionic/exidx_dynamic.c",
+ "arch-arm/bionic/atexit_legacy.c",
+ ],
+}
+
+filegroup {
+ name: "libc_sources_static_arm",
+ srcs: [ "arch-arm/bionic/exidx_static.c" ],
+}
+
// ========================================================
// libc.a + libc.so
// ========================================================
@@ -1492,10 +1525,7 @@
},
},
static: {
- srcs: [
- "bionic/dl_iterate_phdr_static.cpp",
- "bionic/malloc_common.cpp",
- ],
+ srcs: [ ":libc_sources_static" ],
cflags: ["-DLIBC_STATIC"],
whole_static_libs: [
"libc_init_static",
@@ -1503,14 +1533,7 @@
],
},
shared: {
- srcs: [
- "arch-common/bionic/crtbegin_so.c",
- "arch-common/bionic/crtbrand.S",
- "bionic/icu.cpp",
- "bionic/malloc_common.cpp",
- "bionic/NetdClient.cpp",
- "arch-common/bionic/crtend_so.S",
- ],
+ srcs: [ ":libc_sources_shared" ],
whole_static_libs: [
"libc_init_dynamic",
"libc_common_shared",
@@ -1556,17 +1579,12 @@
version_script: "libc.arm.map",
shared: {
- srcs: [
- "arch-arm/bionic/exidx_dynamic.c",
-
- // special for arm
- "arch-arm/bionic/atexit_legacy.c",
- ],
+ srcs: [":libc_sources_shared_arm"],
// special for arm
cflags: ["-DCRT_LEGACY_WORKAROUND"],
},
static: {
- srcs: ["arch-arm/bionic/exidx_static.c"],
+ srcs: [":libc_sources_static_arm"],
},
},
arm64: {
diff --git a/libc/include/paths.h b/libc/include/paths.h
index dc1c523..b5b8610 100644
--- a/libc/include/paths.h
+++ b/libc/include/paths.h
@@ -47,7 +47,7 @@
#define _PATH_CONSOLE "/dev/console"
/** Default shell search path. */
-#define _PATH_DEFPATH "/sbin:/system/sbin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
+#define _PATH_DEFPATH "/sbin:/system/sbin:/apex/com.android.runtime/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
/** Path to the directory containing device files. */
#define _PATH_DEV "/dev/"