summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-02-20 02:02:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-02-20 02:02:59 +0000
commit0609e8d231822c6be9ab33eba3d6514525ce3ae6 (patch)
treecbdae5e4eeed5ec4e665448cf338ab63af27f681 /trusty
parentcb1b68f9b3f7c4b33fda5bb88445b0c573e86a35 (diff)
parentdc699a269f6a22af6cbba0f6e1359fde103dc4d3 (diff)
downloadsystem_core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.tar.gz
system_core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.tar.bz2
system_core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.zip
Merge "bpfmt."
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/Android.bp5
-rw-r--r--trusty/libtrusty/Android.bp5
-rw-r--r--trusty/libtrusty/tipc-test/Android.bp5
-rw-r--r--trusty/storage/lib/Android.bp2
-rw-r--r--trusty/storage/proxy/Android.bp2
5 files changed, 14 insertions, 5 deletions
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 322a63d28..5428e733e 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -31,7 +31,10 @@ cc_binary {
"trusty_keymaster_ipc.cpp",
"trusty_keymaster_main.cpp",
],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: [
"libcrypto",
"libcutils",
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index c48deed1c..f6e9bee3d 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -22,7 +22,10 @@ cc_library {
srcs: ["trusty.c"],
export_include_dirs: ["include"],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: ["liblog"],
}
diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp
index 1e8467f0f..32499e3f1 100644
--- a/trusty/libtrusty/tipc-test/Android.bp
+++ b/trusty/libtrusty/tipc-test/Android.bp
@@ -25,5 +25,8 @@ cc_test {
"liblog",
],
gtest: false,
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
}
diff --git a/trusty/storage/lib/Android.bp b/trusty/storage/lib/Android.bp
index 4e41674bd..2fba17edd 100644
--- a/trusty/storage/lib/Android.bp
+++ b/trusty/storage/lib/Android.bp
@@ -34,5 +34,5 @@ cc_library_static {
"-fvisibility=hidden",
"-Wall",
"-Werror",
- ]
+ ],
}
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
index da8542d5a..b93facbbc 100644
--- a/trusty/storage/proxy/Android.bp
+++ b/trusty/storage/proxy/Android.bp
@@ -36,5 +36,5 @@ cc_binary {
cflags: [
"-Wall",
"-Werror",
- ]
+ ],
}