Merge "hwasan+fortify: don't use _chk variants of memcpy()/memmove()/memset()." into main am: 0f4721d55a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3537082
Change-Id: Idd266cba74cdc198f7b5d125312a04b26289ad6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index b4223ea..8aba6e4 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -5,5 +5,4 @@
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
[Hook Scripts]
-aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "."
notice = tools/update_notice.sh
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index 37c1ef0..db814dc 100644
--- a/tests/malloc_test.cpp
+++ b/tests/malloc_test.cpp
@@ -1800,10 +1800,10 @@
// fork'd and exec'd processes.
ASSERT_EQ(0, setenv("MALLOC_USE_APP_DEFAULTS", "1", 1));
ExecTestHelper eth;
- eth.SetArgs({testing::internal::GetArgvs()[0].c_str(), "--gtest_also_run_disabled_tests",
+ std::string executable(testing::internal::GetArgvs()[0]);
+ eth.SetArgs({executable.c_str(), "--gtest_also_run_disabled_tests",
"--gtest_filter=android_mallopt.DISABLED_verify_decay_time_on", nullptr});
- eth.Run([&]() { execv(testing::internal::GetArgvs()[0].c_str(), eth.GetArgs()); }, 0,
- R"(\[ PASSED \] 1 test)");
+ eth.Run([&]() { execv(executable.c_str(), eth.GetArgs()); }, 0, R"(\[ PASSED \] 1 test)");
#else
GTEST_SKIP() << "bionic-only test";
#endif