commit 4f79af9019e4abdcfd070f92b1294ed1ed953bcd
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 26 18:16:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 26 18:16:23 2021 +0000
tree 9fdcbba6df9a2169272847d5d9a2ef0a53a5e249
parent e527450bb685f6e5aa6c7f726f13002edcb9b629
parent 898bb8f4a0e1ee976eb33a8410f7f472d1dac01f

Merge "Add .clang-format to frameworks/av" am: e887c77709 am: d556d4060d am: 898bb8f4a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1794568

Change-Id: Icfb35b28cd6158977c88d90290d0a376a266a6c1

.clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..a7614d2
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+Standard: Cpp11
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IndentWidth: 4
+ContinuationIndentWidth: 8
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never

media/codec2/hidl/1.0/vts/.clang-format

diff --git a/media/codec2/hidl/1.0/vts/.clang-format b/media/codec2/hidl/1.0/vts/.clang-format
deleted file mode 120000
index 136279c..0000000
--- a/media/codec2/hidl/1.0/vts/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../build/soong/scripts/system-clang-format
\ No newline at end of file

media/libeffects/preprocessing/.clang-format

diff --git a/media/libeffects/preprocessing/.clang-format b/media/libeffects/preprocessing/.clang-format
deleted file mode 120000
index f1b4f69..0000000
--- a/media/libeffects/preprocessing/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../build/soong/scripts/system-clang-format
\ No newline at end of file