commit e3659e7ed74f94b5ff8424071710be06d532cbd9
author Elliott Hughes <enh@google.com> Wed Mar 12 13:41:50 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 12 13:41:50 2025 -0700
tree 117753b2e8d51e91a0d37e486da42db6371ecd80
parent 56e4466f984eb0d4d93c62d0293d9834f7cd149f
parent 07ec41fef171941d8369763f5f1f1d48a5f0047d

Merge "Add a compile-time warning for malloc_usable_size() with _FORTIFY_SOURCE=3." into main am: da5c77dc03 am: 07ec41fef1

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3539499

Change-Id: I8e172364d83546393bdbf450caf58a774a06ec49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

PREUPLOAD.cfg

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