From dc699a269f6a22af6cbba0f6e1359fde103dc4d3 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 16 Feb 2018 17:58:14 -0800 Subject: [PATCH] bpfmt. Bug: N/A Test: builds Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac --- adb/Android.bp | 60 +++++++++++++-------------- base/Android.bp | 6 ++- debuggerd/Android.bp | 15 ++++--- demangle/Android.bp | 4 +- init/Android.bp | 2 +- init/test_service/Android.bp | 5 ++- libappfuse/Android.bp | 4 +- libasyncio/Android.bp | 6 ++- libbacktrace/Android.bp | 13 +++--- libion/Android.bp | 1 - libmemunreachable/Android.bp | 2 +- libnativebridge/Android.bp | 10 +++-- libnativeloader/test/Android.bp | 11 +++-- libpackagelistparser/Android.bp | 5 ++- libprocinfo/Android.bp | 11 ++++- libsystem/Android.bp | 2 +- libunwindstack/Android.bp | 10 ++++- libutils/Android.bp | 14 +++++-- libutils/tests/Android.bp | 10 ++++- libvndksupport/Android.bp | 5 ++- libvndksupport/tests/Android.bp | 7 +++- logcat/Android.bp | 7 +++- logd/Android.bp | 2 +- logwrapper/Android.bp | 2 +- trusty/keymaster/Android.bp | 5 ++- trusty/libtrusty/Android.bp | 5 ++- trusty/libtrusty/tipc-test/Android.bp | 5 ++- trusty/storage/lib/Android.bp | 2 +- trusty/storage/proxy/Android.bp | 2 +- usbd/Android.bp | 1 - 30 files changed, 148 insertions(+), 86 deletions(-) diff --git a/adb/Android.bp b/adb/Android.bp index 41f7b8952..0858a6c12 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -13,39 +13,39 @@ // limitations under the License. python_binary_host { - name: "adb_integration_test_adb", - main: "test_adb.py", - srcs: [ - "test_adb.py", - ], - libs: [ - "adb_py", - ], - version: { - py2: { - enabled: true, + name: "adb_integration_test_adb", + main: "test_adb.py", + srcs: [ + "test_adb.py", + ], + libs: [ + "adb_py", + ], + version: { + py2: { + enabled: true, + }, + py3: { + enabled: false, + }, }, - py3: { - enabled: false, - }, - }, } python_binary_host { - name: "adb_integration_test_device", - main: "test_device.py", - srcs: [ - "test_device.py", - ], - libs: [ - "adb_py", - ], - version: { - py2: { - enabled: true, + name: "adb_integration_test_device", + main: "test_device.py", + srcs: [ + "test_device.py", + ], + libs: [ + "adb_py", + ], + version: { + py2: { + enabled: true, + }, + py3: { + enabled: false, + }, }, - py3: { - enabled: false, - }, - }, } diff --git a/base/Android.bp b/base/Android.bp index 6cadcfc0f..acbc6b7c0 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -16,7 +16,11 @@ cc_defaults { name: "libbase_defaults", - cflags: ["-Wall", "-Werror", "-Wextra"], + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], } cc_library_headers { diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 532352410..7e6f24d15 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -16,7 +16,7 @@ cc_defaults { cc_library_headers { name: "libdebuggerd_common_headers", - export_include_dirs: ["common/include"] + export_include_dirs: ["common/include"], } cc_library_shared { @@ -39,7 +39,7 @@ cc_library_shared { ], export_header_lib_headers: ["libdebuggerd_common_headers"], - export_include_dirs: ["tombstoned/include"] + export_include_dirs: ["tombstoned/include"], } // Utility library to tombstoned and get an output fd. @@ -60,7 +60,7 @@ cc_library_static { ], export_header_lib_headers: ["libdebuggerd_common_headers"], - export_include_dirs: ["tombstoned/include"] + export_include_dirs: ["tombstoned/include"], } // Core implementation, linked into libdebuggerd_handler and the dynamic linker. @@ -186,7 +186,10 @@ cc_test { "client/debuggerd_client_test.cpp", "debuggerd_test.cpp", ], - static_libs: ["libasync_safe", "libtombstoned_client_static"], + static_libs: [ + "libasync_safe", + "libtombstoned_client_static", + ], }, }, @@ -197,7 +200,7 @@ cc_test { "libdebuggerd_client", "liblog", "libminijail", - "libnativehelper" + "libnativehelper", ], static_libs: [ @@ -298,7 +301,7 @@ cc_binary { "liblog", ], - init_rc: ["tombstoned/tombstoned.rc"] + init_rc: ["tombstoned/tombstoned.rc"], } subdirs = [ diff --git a/demangle/Android.bp b/demangle/Android.bp index 89b87725f..8d5b1350c 100644 --- a/demangle/Android.bp +++ b/demangle/Android.bp @@ -42,11 +42,11 @@ cc_library { ], local_include_dirs: [ - "include", + "include", ], export_include_dirs: [ - "include", + "include", ], } diff --git a/init/Android.bp b/init/Android.bp index 1f2ad2e78..69b4ee4a7 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -56,7 +56,7 @@ cc_defaults { }, uml: { cppflags: ["-DUSER_MODE_LINUX"], - } + }, }, static_libs: [ "libbootloader_message", diff --git a/init/test_service/Android.bp b/init/test_service/Android.bp index 63996993a..8bd16a74f 100644 --- a/init/test_service/Android.bp +++ b/init/test_service/Android.bp @@ -17,7 +17,10 @@ cc_binary { name: "test_service", srcs: ["test_service.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libbase"], init_rc: ["test_service.rc"], } diff --git a/libappfuse/Android.bp b/libappfuse/Android.bp index 29ffe3244..ae1481f72 100644 --- a/libappfuse/Android.bp +++ b/libappfuse/Android.bp @@ -19,7 +19,7 @@ cc_library_shared { "FuseBuffer.cc", "FuseBridgeLoop.cc", "EpollController.cc", - ] + ], } cc_test { @@ -31,5 +31,5 @@ cc_test { "tests/FuseAppLoopTest.cc", "tests/FuseBridgeLoopTest.cc", "tests/FuseBufferTest.cc", - ] + ], } diff --git a/libasyncio/Android.bp b/libasyncio/Android.bp index 9a12f0d2d..8a2afea3d 100644 --- a/libasyncio/Android.bp +++ b/libasyncio/Android.bp @@ -16,7 +16,11 @@ cc_defaults { name: "libasyncio_defaults", - cflags: ["-Wall", "-Werror", "-Wextra"], + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], } cc_library { diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp index be5653131..4bd01d2cc 100644 --- a/libbacktrace/Android.bp +++ b/libbacktrace/Android.bp @@ -27,7 +27,6 @@ cc_defaults { include_dirs: ["external/libunwind/include/tdep"], - target: { darwin: { enabled: false, @@ -41,7 +40,7 @@ cc_defaults { lib64: { suffix: "64", }, - } + }, } libbacktrace_sources = [ @@ -84,8 +83,8 @@ cc_library { darwin: { enabled: true, shared_libs: [ - "libbase", - ], + "libbase", + ], }, linux: { srcs: libbacktrace_sources, @@ -106,7 +105,7 @@ cc_library { "art/runtime", ], - header_libs: [ "jni_headers", ], + header_libs: ["jni_headers"], }, android: { static_libs: ["libasync_safe"], @@ -114,7 +113,7 @@ cc_library { vendor: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], exclude_shared_libs: ["libdexfile"], - } + }, }, whole_static_libs: ["libdemangle"], } @@ -130,7 +129,7 @@ cc_library_shared { srcs: ["backtrace_testlib.cpp"], shared_libs: [ - "libunwindstack", + "libunwindstack", ], } diff --git a/libion/Android.bp b/libion/Android.bp index 6d9fae076..2f73d92ca 100644 --- a/libion/Android.bp +++ b/libion/Android.bp @@ -1,4 +1,3 @@ - cc_library { name: "libion", vendor_available: true, diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp index 8b76a6513..b428dd785 100644 --- a/libmemunreachable/Android.bp +++ b/libmemunreachable/Android.bp @@ -16,7 +16,7 @@ cc_defaults { }, host: { shared_libs: ["liblog"], - } + }, }, } diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index 089f3b825..6e63b74c6 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -1,9 +1,8 @@ - cc_library_headers { name: "libnativebridge-dummy-headers", host_supported: true, - export_include_dirs=["include"], + export_include_dirs: ["include"], } cc_library { @@ -11,9 +10,12 @@ cc_library { host_supported: true, srcs: ["native_bridge.cc"], - shared_libs: ["liblog", "libbase"], + shared_libs: [ + "liblog", + "libbase", + ], - export_include_dirs=["include"], + export_include_dirs: ["include"], cflags: [ "-Werror", diff --git a/libnativeloader/test/Android.bp b/libnativeloader/test/Android.bp index 2d3370435..5cf88b09b 100644 --- a/libnativeloader/test/Android.bp +++ b/libnativeloader/test/Android.bp @@ -17,31 +17,34 @@ cc_library { name: "libfoo.oem1", srcs: ["test.cpp"], - cflags : ["-DLIBNAME=\"libfoo.oem1.so\""], + cflags: ["-DLIBNAME=\"libfoo.oem1.so\""], shared_libs: [ "libbase", ], } + cc_library { name: "libbar.oem1", srcs: ["test.cpp"], - cflags : ["-DLIBNAME=\"libbar.oem1.so\""], + cflags: ["-DLIBNAME=\"libbar.oem1.so\""], shared_libs: [ "libbase", ], } + cc_library { name: "libfoo.oem2", srcs: ["test.cpp"], - cflags : ["-DLIBNAME=\"libfoo.oem2.so\""], + cflags: ["-DLIBNAME=\"libfoo.oem2.so\""], shared_libs: [ "libbase", ], } + cc_library { name: "libbar.oem2", srcs: ["test.cpp"], - cflags : ["-DLIBNAME=\"libbar.oem2.so\""], + cflags: ["-DLIBNAME=\"libbar.oem2.so\""], shared_libs: [ "libbase", ], diff --git a/libpackagelistparser/Android.bp b/libpackagelistparser/Android.bp index 3d202fc1d..27693b3f8 100644 --- a/libpackagelistparser/Android.bp +++ b/libpackagelistparser/Android.bp @@ -2,7 +2,10 @@ cc_library { name: "libpackagelistparser", srcs: ["packagelistparser.c"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["liblog"], local_include_dirs: ["include"], export_include_dirs: ["include"], diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp index 1cfabd5be..83b0a7fcf 100644 --- a/libprocinfo/Android.bp +++ b/libprocinfo/Android.bp @@ -16,7 +16,11 @@ cc_defaults { name: "libprocinfo_defaults", - cflags: ["-Wall", "-Werror", "-Wextra"], + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], } cc_library { @@ -65,7 +69,10 @@ cc_test { }, }, - shared_libs: ["libbase", "libprocinfo"], + shared_libs: [ + "libbase", + "libprocinfo", + ], compile_multilib: "both", multilib: { diff --git a/libsystem/Android.bp b/libsystem/Android.bp index 846a58526..82bf1bce0 100644 --- a/libsystem/Android.bp +++ b/libsystem/Android.bp @@ -11,5 +11,5 @@ cc_library_headers { windows: { enabled: true, }, - } + }, } diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp index a7bdd2e6d..124c70e83 100644 --- a/libunwindstack/Android.bp +++ b/libunwindstack/Android.bp @@ -78,7 +78,10 @@ cc_library { target: { // Always disable optimizations for host to make it easier to debug. host: { - cflags: ["-O0", "-g"], + cflags: [ + "-O0", + "-g", + ], }, vendor: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], @@ -131,7 +134,10 @@ cc_library_static { target: { // Always disable optimizations for host to make it easier to debug. host: { - cflags: ["-O0", "-g"], + cflags: [ + "-O0", + "-g", + ], }, }, diff --git a/libutils/Android.bp b/libutils/Android.bp index 2be5d9896..209bf9a93 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -20,12 +20,12 @@ cc_library_headers { header_libs: [ "liblog_headers", "libsystem_headers", - "libcutils_headers" + "libcutils_headers", ], export_header_lib_headers: [ "liblog_headers", "libsystem_headers", - "libcutils_headers" + "libcutils_headers", ], export_include_dirs: ["include"], @@ -52,7 +52,10 @@ cc_defaults { }, host_supported: true, - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], include_dirs: ["external/safe-iop/include"], header_libs: [ "libutils_headers", @@ -193,7 +196,10 @@ cc_test { static_libs: ["libutils"], shared_libs: ["liblog"], srcs: ["SharedBufferTest.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], } subdirs = ["tests"] diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp index a3e7ffe73..1390552fa 100644 --- a/libutils/tests/Android.bp +++ b/libutils/tests/Android.bp @@ -77,7 +77,10 @@ cc_test_library { host_supported: true, relative_install_path: "libutils_tests", srcs: ["Singleton_test1.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], } cc_test_library { @@ -85,6 +88,9 @@ cc_test_library { host_supported: true, relative_install_path: "libutils_tests", srcs: ["Singleton_test2.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libutils_tests_singleton1"], } diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp index fec79b70d..e73b36652 100644 --- a/libvndksupport/Android.bp +++ b/libvndksupport/Android.bp @@ -3,7 +3,10 @@ subdirs = ["tests"] cc_library { name: "libvndksupport", srcs: ["linker.c"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], local_include_dirs: ["include/vndksupport"], export_include_dirs: ["include"], shared_libs: ["liblog"], diff --git a/libvndksupport/tests/Android.bp b/libvndksupport/tests/Android.bp index 5b467f8ff..2570cce95 100644 --- a/libvndksupport/tests/Android.bp +++ b/libvndksupport/tests/Android.bp @@ -17,11 +17,14 @@ cc_test { srcs: [ "linker_test.cpp", ], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], host_supported: false, shared_libs: [ "libvndksupport", "libbase", - ] + ], } diff --git a/logcat/Android.bp b/logcat/Android.bp index afc7a0182..01beb53e8 100644 --- a/logcat/Android.bp +++ b/logcat/Android.bp @@ -68,8 +68,11 @@ cc_prebuilt_binary { srcs: ["logpersist"], init_rc: ["logcatd.rc"], required: ["logcatd"], - symlinks: ["logpersist.stop", "logpersist.cat"], + symlinks: [ + "logpersist.stop", + "logpersist.cat", + ], strip: { none: true, - } + }, } diff --git a/logd/Android.bp b/logd/Android.bp index 68b79d32e..5c79976a3 100644 --- a/logd/Android.bp +++ b/logd/Android.bp @@ -25,7 +25,7 @@ event_flag = [ "-DAUDITD_LOG_TAG=1003", "-DCHATTY_LOG_TAG=1004", "-DTAG_DEF_LOG_TAG=1005", - "-DLIBLOG_LOG_TAG=1006" + "-DLIBLOG_LOG_TAG=1006", ] cc_library_static { diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp index ccb1aa609..f163f576b 100644 --- a/logwrapper/Android.bp +++ b/logwrapper/Android.bp @@ -49,5 +49,5 @@ cc_benchmark { ], cflags: [ "-Werror", - ] + ], } 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", - ] + ], } diff --git a/usbd/Android.bp b/usbd/Android.bp index 4f9338fef..3afa7a951 100644 --- a/usbd/Android.bp +++ b/usbd/Android.bp @@ -13,4 +13,3 @@ cc_binary { "libcutils", ], } -