commit 3800dbdda7f4bdee7a2b955a6718a8c815ed4910
author Yifan Hong <elsk@google.com> Thu Jan 16 05:02:54 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 05:02:54 2020 +0000
tree a19ddd2d9fdd99dcf4a055c25b65a349bfa4b809
parent 34bf3f76212f468bc6995ecab4c262a9747597ca
parent 5d07df98bb072a357d69080755a4c054fbeddd4e

Merge "qemu_trusty: Fix VINTF file inclusion."

.clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..b0dc94c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,10 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+UseTab: Never
+BreakBeforeBraces: Attach
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: true
+IndentCaseLabels: false
+ColumnLimit: 100
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 2

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..dcf92be
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,8 @@
+[Builtin Hooks]
+clang_format = true
+
+[Builtin Hooks Options]
+clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
+
+[Hook Scripts]
+aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "."

qemu_trusty_base.mk

diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 7fa7448..5c6e63e 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -120,3 +120,6 @@
     ims-common \
     android.test.base \
 
+PRODUCT_UPDATABLE_BOOT_JARS := \
+    com.android.conscrypt:conscrypt \
+