Merge "Format all of the blueprint files." into main
This commit is contained in:
commit
bf970740ce
5 changed files with 26 additions and 19 deletions
|
@ -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",
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -52,4 +52,3 @@ java_library_static {
|
|||
sdk_version: "current",
|
||||
static_libs: ["libprotobuf-java-lite"],
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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"],
|
||||
|
|
Loading…
Reference in a new issue