| commit | 8f34219d392e130b30e31885b98bb6a20e06bffa | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Feb 23 19:05:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 19:05:33 2021 +0000 |
| tree | 934e57999786a246d0a9d4cc8c30d50ab5f21544 | |
| parent | d4b8cabeb645a15714af077324562862daa90e18 [diff] | |
| parent | 86c4c55d81d9e6820b30b801bbdf85396e0e742f [diff] |
Disallow use of error-prone merge-strategies am: 86c4c55d81 Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1602053 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9bb65fe0c79a1fa0a0e27c9cc51d0aa1d1b6c9bc
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 65c2b62..c0ddf19 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg
@@ -5,3 +5,6 @@ [Builtin Hooks Options] clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp + +[Hook Scripts] +do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}