Merge "Add module name to sh_test install path." am: ec215e074e am: 4abe89a396 am: a1c9b96cb8 am: b05f1466e2 am: f5a361405e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1330883
Change-Id: Ica4a0846e19d73ca8bef1d80b228f04671323331
diff --git a/apex/apex.go b/apex/apex.go
index fd38c99..ee09dff 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -190,7 +190,6 @@
"ExtServices-core",
"ExtServices",
"libtextclassifier-java",
- "libz_current",
"textclassifier-statsd",
"TextClassifierNotificationLibNoManifest",
"TextClassifierServiceLibNoManifest",
@@ -390,7 +389,6 @@
"libbinderthreadstateutils",
"libbluetooth-types-header",
"libbufferhub_headers",
- "libc_scudo",
"libcodec2",
"libcodec2_headers",
"libcodec2_hidl@1.0",
diff --git a/cc/compiler.go b/cc/compiler.go
index b5f297c..08ce133 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -300,7 +300,8 @@
if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"${config.CommonGlobalIncludes}",
- tc.IncludeFlags())
+ tc.IncludeFlags(),
+ "${config.CommonNativehelperInclude}")
}
if ctx.useSdk() {
diff --git a/cc/linker.go b/cc/linker.go
index c9cbd9b..58f8a29 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -298,17 +298,6 @@
}
}
- if inList("libc_scudo", deps.SharedLibs) {
- // libc_scudo is an alternate implementation of all
- // allocation functions (malloc, free), that uses
- // the scudo allocator instead of the default native
- // allocator. If this library is in the list, make
- // sure it's first so it properly overrides the
- // allocation functions of all other shared libraries.
- _, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)
- deps.SharedLibs = append([]string{"libc_scudo"}, deps.SharedLibs...)
- }
-
// If libc and libdl are both in system_shared_libs make sure libdl comes after libc
// to avoid loading libdl before libc.
if inList("libdl", systemSharedLibs) && inList("libc", systemSharedLibs) &&
diff --git a/cc/sanitize.go b/cc/sanitize.go
index aaaf694..72ad6d7 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -408,16 +408,6 @@
return deps
}
- if ctx.Device() {
- if Bool(sanitize.Properties.Sanitize.Address) {
- // Compiling asan and having libc_scudo in the same
- // executable will cause the executable to crash.
- // Remove libc_scudo since it is only used to override
- // allocation functions which asan already overrides.
- _, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)
- }
- }
-
return deps
}
