diff options
author | Christopher Ferris <cferris@google.com> | 2024-02-26 13:29:20 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2024-02-26 13:34:38 -0800 |
commit | 2bf7db3de0b4d3c1583cdef7387d5fbbd0d5aff9 (patch) | |
tree | d20a9a03c43469dbfff8305fe3ad3e54f01a7bb4 /debuggerd | |
parent | d3fb7a63553abf8857bbaf997fc673d7da77a6dd (diff) | |
download | core-2bf7db3de0b4d3c1583cdef7387d5fbbd0d5aff9.tar.gz |
Format all of the blueprint files.
I'm tired of seeing the bpfmt warning, so fix this for all debuggerd
blueprint files.
Test: Compiles
Change-Id: I3b25365a7272aebe9cbac28455cf8b9b86b04c6e
Diffstat (limited to 'debuggerd')
-rw-r--r-- | debuggerd/Android.bp | 14 | ||||
-rw-r--r-- | debuggerd/crasher/Android.bp | 2 | ||||
-rw-r--r-- | debuggerd/proto/Android.bp | 1 | ||||
-rw-r--r-- | debuggerd/rust/tombstoned_client/Android.bp | 2 | ||||
-rw-r--r-- | debuggerd/test_permissive_mte/Android.bp | 26 |
5 files changed, 26 insertions, 19 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 7d20995d7..439218d4d 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -21,8 +21,11 @@ cc_defaults { local_include_dirs: ["include"], product_variables: { debuggable: { - cflags: ["-UANDROID_DEBUGGABLE", "-DANDROID_DEBUGGABLE=1"], - } + cflags: [ + "-UANDROID_DEBUGGABLE", + "-DANDROID_DEBUGGABLE=1", + ], + }, }, } @@ -256,7 +259,7 @@ cc_library_static { ], static_libs: [ - "libdexfile_support", // libunwindstack dependency + "libdexfile_support", // libunwindstack dependency "libunwindstack", "liblzma", "libbase", @@ -299,7 +302,7 @@ cc_library_static { }, android: { runtime_libs: [ - "libdexfile", // libdexfile_support dependency + "libdexfile", // libdexfile_support dependency ], }, }, @@ -494,7 +497,7 @@ cc_defaults { header_libs: [ "bionic_libc_platform_headers", - "libdebuggerd_common_headers" + "libdebuggerd_common_headers", ], static_libs: [ @@ -552,7 +555,6 @@ prebuilt_etc { }, } - // This installs the "other" architecture (so 32-bit on 64-bit device). prebuilt_etc { name: "crash_dump.policy_other", diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp index fe1689c71..4c6a400a1 100644 --- a/debuggerd/crasher/Android.bp +++ b/debuggerd/crasher/Android.bp @@ -15,7 +15,7 @@ cc_defaults { "-fstack-protector-all", "-Wno-date-time", ], - tidy: false, // crasher.cpp tests many memory access errors + tidy: false, // crasher.cpp tests many memory access errors srcs: ["crasher.cpp"], arch: { arm: { diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp index 7be5d61a0..7b9e780cc 100644 --- a/debuggerd/proto/Android.bp +++ b/debuggerd/proto/Android.bp @@ -52,4 +52,3 @@ java_library_static { sdk_version: "current", static_libs: ["libprotobuf-java-lite"], } - diff --git a/debuggerd/rust/tombstoned_client/Android.bp b/debuggerd/rust/tombstoned_client/Android.bp index 2007f3934..bf19bb779 100644 --- a/debuggerd/rust/tombstoned_client/Android.bp +++ b/debuggerd/rust/tombstoned_client/Android.bp @@ -8,7 +8,7 @@ cc_library_static { "wrapper.cpp", ], generated_sources: [ - "libtombstoned_client_rust_bridge_code" + "libtombstoned_client_rust_bridge_code", ], header_libs: [ "libbase_headers", diff --git a/debuggerd/test_permissive_mte/Android.bp b/debuggerd/test_permissive_mte/Android.bp index d3f752064..0ad32439d 100644 --- a/debuggerd/test_permissive_mte/Android.bp +++ b/debuggerd/test_permissive_mte/Android.bp @@ -17,22 +17,28 @@ package { } cc_binary { - name: "mte_crash", - tidy: false, - srcs: ["mte_crash.cpp"], - sanitize: { - memtag_heap: true, - diag: { - memtag_heap: true, + name: "mte_crash", + tidy: false, + srcs: ["mte_crash.cpp"], + sanitize: { + memtag_heap: true, + diag: { + memtag_heap: true, + }, }, - }, } java_test_host { name: "permissive_mte_test", libs: ["tradefed"], - static_libs: ["frameworks-base-hostutils", "cts-install-lib-host"], - srcs: ["src/**/PermissiveMteTest.java", ":libtombstone_proto-src"], + static_libs: [ + "frameworks-base-hostutils", + "cts-install-lib-host", + ], + srcs: [ + "src/**/PermissiveMteTest.java", + ":libtombstone_proto-src", + ], data: [":mte_crash"], test_config: "AndroidTest.xml", test_suites: ["general-tests"], |