Merge "tests: Clean up the files in TemporaryDir."
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..b5f5f03
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,6 @@
+[Builtin Hooks]
+clang_format = true
+
+[Builtin Hooks Options]
+# Handle native codes only.
+clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 922f67a..4d2d4b7 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -158,6 +158,7 @@
"libbase",
"libutils",
"liblog",
+ "libbrotli",
"libbz",
"libz",
],
diff --git a/tests/Android.mk b/tests/Android.mk
index b0f71a8..8ebb603 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -208,6 +208,7 @@
libutils \
libbase \
libcrypto \
+ libbrotli \
libbz \
libdivsufsort64 \
libdivsufsort \