diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-27 20:16:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 20:16:08 +0200 |
| commit | f38c64e8b13d5700f87087f731dddf2590300432 (patch) | |
| tree | 410209cc02328fc1655925b546e853381e61efb3 /misc/hooks/pre-commit-clang-format | |
| parent | b7c46ed9298b6be4d61574979f686f59b8313be0 (diff) | |
| parent | eb8d181cb216b022cdf697b8ce1ea5e0d3b70fd7 (diff) | |
Merge pull request #31709 from akien-mga/android-fix-thirdparty
Android: Fix another regression with Secure.ANDROID_ID, and fix formatting and documentation of thirdparty code
Diffstat (limited to 'misc/hooks/pre-commit-clang-format')
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index db241ad172..3a0ac9f389 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -86,6 +86,9 @@ do if grep -q "thirdparty" <<< $file; then continue; fi + if grep -q "platform/android/java/src/com" <<< $file; then + continue; + fi # ignore file if we do check for file extensions and the file # does not match any of the extensions specified in $FILE_EXTS |