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
This commit is contained in:
Christopher Ferris 2024-02-26 13:29:20 -08:00
parent d3fb7a6355
commit 2bf7db3de0
5 changed files with 26 additions and 19 deletions

View File

@ -21,8 +21,11 @@ cc_defaults {
local_include_dirs: ["include"], local_include_dirs: ["include"],
product_variables: { product_variables: {
debuggable: { debuggable: {
cflags: ["-UANDROID_DEBUGGABLE", "-DANDROID_DEBUGGABLE=1"], cflags: [
} "-UANDROID_DEBUGGABLE",
"-DANDROID_DEBUGGABLE=1",
],
},
}, },
} }
@ -256,7 +259,7 @@ cc_library_static {
], ],
static_libs: [ static_libs: [
"libdexfile_support", // libunwindstack dependency "libdexfile_support", // libunwindstack dependency
"libunwindstack", "libunwindstack",
"liblzma", "liblzma",
"libbase", "libbase",
@ -299,7 +302,7 @@ cc_library_static {
}, },
android: { android: {
runtime_libs: [ runtime_libs: [
"libdexfile", // libdexfile_support dependency "libdexfile", // libdexfile_support dependency
], ],
}, },
}, },
@ -494,7 +497,7 @@ cc_defaults {
header_libs: [ header_libs: [
"bionic_libc_platform_headers", "bionic_libc_platform_headers",
"libdebuggerd_common_headers" "libdebuggerd_common_headers",
], ],
static_libs: [ static_libs: [
@ -552,7 +555,6 @@ prebuilt_etc {
}, },
} }
// This installs the "other" architecture (so 32-bit on 64-bit device). // This installs the "other" architecture (so 32-bit on 64-bit device).
prebuilt_etc { prebuilt_etc {
name: "crash_dump.policy_other", name: "crash_dump.policy_other",

View File

@ -15,7 +15,7 @@ cc_defaults {
"-fstack-protector-all", "-fstack-protector-all",
"-Wno-date-time", "-Wno-date-time",
], ],
tidy: false, // crasher.cpp tests many memory access errors tidy: false, // crasher.cpp tests many memory access errors
srcs: ["crasher.cpp"], srcs: ["crasher.cpp"],
arch: { arch: {
arm: { arm: {

View File

@ -52,4 +52,3 @@ java_library_static {
sdk_version: "current", sdk_version: "current",
static_libs: ["libprotobuf-java-lite"], static_libs: ["libprotobuf-java-lite"],
} }

View File

@ -8,7 +8,7 @@ cc_library_static {
"wrapper.cpp", "wrapper.cpp",
], ],
generated_sources: [ generated_sources: [
"libtombstoned_client_rust_bridge_code" "libtombstoned_client_rust_bridge_code",
], ],
header_libs: [ header_libs: [
"libbase_headers", "libbase_headers",

View File

@ -17,22 +17,28 @@ package {
} }
cc_binary { cc_binary {
name: "mte_crash", name: "mte_crash",
tidy: false, tidy: false,
srcs: ["mte_crash.cpp"], srcs: ["mte_crash.cpp"],
sanitize: { sanitize: {
memtag_heap: true, memtag_heap: true,
diag: { diag: {
memtag_heap: true, memtag_heap: true,
},
}, },
},
} }
java_test_host { java_test_host {
name: "permissive_mte_test", name: "permissive_mte_test",
libs: ["tradefed"], libs: ["tradefed"],
static_libs: ["frameworks-base-hostutils", "cts-install-lib-host"], static_libs: [
srcs: ["src/**/PermissiveMteTest.java", ":libtombstone_proto-src"], "frameworks-base-hostutils",
"cts-install-lib-host",
],
srcs: [
"src/**/PermissiveMteTest.java",
":libtombstone_proto-src",
],
data: [":mte_crash"], data: [":mte_crash"],
test_config: "AndroidTest.xml", test_config: "AndroidTest.xml",
test_suites: ["general-tests"], test_suites: ["general-tests"],