Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a4ebea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix pre-upload due to migration" am: 8643c899 am: a9b735c6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1927381

Change-Id: Ie02fc72d0f18d7663f9632f1bec7dd2e5ead2a0a
parents 1d8577df a9b735c6

PREUPLOAD.cfg

+5 −1
Original line number Diff line number Diff line
@@ -9,5 +9,9 @@ rustfmt = true 
rustfmt = --config-path=rustfmt.toml



[Hook Scripts]

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ".*$"

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw android/app/src/com/android/bluetooth/

                      android/app/lib/mapapi/com/android/bluetooth/mapapi/

                      android/app/tests/src/com/android/bluetooth/

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}

yapf_hook = ./system/tools/scripts/yapf_checker.py

android/app/PREUPLOAD.cfg

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
[Options]

ignore_merged_commits = true



[Builtin Hooks]

clang_format = true



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw src/com/android/bluetooth/

                      lib/mapapi/com/android/bluetooth/mapapi/

                      tests/src/com/android/bluetooth/

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}