diff --git a/libgui/.clang-format b/libgui/.clang-format
new file mode 120000
index 0000000..0457b53
--- /dev/null
+++ b/libgui/.clang-format
@@ -0,0 +1 @@
+../../../../build/soong/scripts/system-clang-format
\ No newline at end of file
diff --git a/libgui/gui_shim.cpp b/libgui/gui_shim.cpp
index 28d438f..e5f358e 100644
--- a/libgui/gui_shim.cpp
+++ b/libgui/gui_shim.cpp
@@ -14,17 +14,19 @@
    limitations under the License.
 */
 
-#include <stdint.h>
 #include <gui/IGraphicBufferProducer.h>
+#include <stdint.h>
 
 using android::IBinder;
 using android::IGraphicBufferProducer;
 using android::sp;
 
 extern "C" void _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEbRKNS1_INS_7IBinderEEE(
-    const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp, const sp<IBinder>& surfaceControlHandle);
+        const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp,
+        const sp<IBinder>& surfaceControlHandle);
 
 extern "C" void _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEb(
-    const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp) {
-        _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEbRKNS1_INS_7IBinderEEE(bufferProducer, controlledByApp, NULL);
+        const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp) {
+    _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEbRKNS1_INS_7IBinderEEE(
+            bufferProducer, controlledByApp, NULL);
 }
diff --git a/libui/.clang-format b/libui/.clang-format
new file mode 120000
index 0000000..0457b53
--- /dev/null
+++ b/libui/.clang-format
@@ -0,0 +1 @@
+../../../../build/soong/scripts/system-clang-format
\ No newline at end of file
diff --git a/libui/GraphicBuffer.cpp b/libui/GraphicBuffer.cpp
index 4b4b61a..1ba91eb 100644
--- a/libui/GraphicBuffer.cpp
+++ b/libui/GraphicBuffer.cpp
@@ -17,9 +17,10 @@
 #include <stdint.h>
 
 extern "C" void _ZN7android13GraphicBuffer4lockEjPPvPiS3_(void* thisptr, uint32_t inUsage,
-        void** vaddr, int32_t* outBytesPerPixel, int32_t* outBytesPerStride);
+                                                          void** vaddr, int32_t* outBytesPerPixel,
+                                                          int32_t* outBytesPerStride);
 
 extern "C" void _ZN7android13GraphicBuffer4lockEjPPv(void* thisptr, uint32_t inUsage,
-        void** vaddr) {
+                                                     void** vaddr) {
     _ZN7android13GraphicBuffer4lockEjPPvPiS3_(thisptr, inUsage, vaddr, nullptr, nullptr);
 }