| commit | 361f8f411831f17f42610ed2856f630d1de3e9ca | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 23 22:48:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 23 22:48:07 2021 +0000 |
| tree | ff4d3a6db5d68081cee847c9854678757532548a | |
| parent | 9af1361162d6fe7c9fca54a279b148529ad40ad5 [diff] | |
| parent | fa27392f8a45e5eeb7e0a94e8c9b199ebae5ce78 [diff] |
Merge "Warn on `repo upload` if you're not uploading to AOSP master." am: 026eb31f80 am: fa27392f8a Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836 Change-Id: Icd0f444c746810df4c9a1cc373eedfad1cd08d8b
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 28aa06f..023d48b 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg
@@ -6,5 +6,6 @@ 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} "." checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} --file_whitelist tools/ updater_sample/