diff options
| author | Elliott Hughes <enh@google.com> | 2018-02-20 02:24:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-20 02:24:45 +0000 |
| commit | 4c33b88c4b072c38eed1bd81517f94885de385f7 (patch) | |
| tree | 135fd8e3cf83af07a5faaedf9ef35de559596205 /trusty | |
| parent | f368568d295302020a55981a9ef1dc4d965b9bf2 (diff) | |
| parent | a91867a7886aa9a18a80716401266ab85c14f440 (diff) | |
| download | system_core-4c33b88c4b072c38eed1bd81517f94885de385f7.tar.gz system_core-4c33b88c4b072c38eed1bd81517f94885de385f7.tar.bz2 system_core-4c33b88c4b072c38eed1bd81517f94885de385f7.zip | |
Merge "bpfmt." am: 0609e8d231 am: b57755c429
am: a91867a788
Change-Id: Ieb0985434e2464e47b3adb93fb27fe5042e91657
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/keymaster/Android.bp | 5 | ||||
| -rw-r--r-- | trusty/libtrusty/Android.bp | 5 | ||||
| -rw-r--r-- | trusty/libtrusty/tipc-test/Android.bp | 5 | ||||
| -rw-r--r-- | trusty/storage/lib/Android.bp | 2 | ||||
| -rw-r--r-- | trusty/storage/proxy/Android.bp | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index 479a7e040..899f8a309 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", - ] + ], } |