dump_modemlog: move android_property_manager
android_property_manager is moved to its own folder in the root of the modem folder. This is so that libeomservice proxy has a specific build target to include. Test: build, flash, check modem logs in bugreport Bug: 302435001 Change-Id: Ifc4a0c888717f5c28cf9b642d0b978b495be29d0
This commit is contained in:
parent
3ed60cec02
commit
047f0aca49
11 changed files with 296 additions and 116 deletions
|
@ -1,5 +1,5 @@
|
|||
package {
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
default_applicable_licenses: [ "Android-Apache-2.0" ],
|
||||
}
|
||||
|
||||
sh_binary {
|
||||
|
@ -9,16 +9,38 @@ sh_binary {
|
|||
sub_dir: "dump",
|
||||
}
|
||||
|
||||
// Modem Log Dumper
|
||||
|
||||
modem_log_dumper_public_deps = [
|
||||
"modem_android_property_manager",
|
||||
]
|
||||
|
||||
// When `modem_log_dumper` is included statically, its dependencies are not
|
||||
// transitively included, so the target will also have to include this default
|
||||
// to restate them.
|
||||
cc_defaults {
|
||||
name: "dump_modemlog_defaults",
|
||||
srcs: [ "modem_log_dumper.cpp" ],
|
||||
local_include_dirs: [ "include" ],
|
||||
shared_libs: [ "liblog" ],
|
||||
name: "modem_log_dumper_defaults",
|
||||
shared_libs: modem_log_dumper_public_deps + [
|
||||
"libbase",
|
||||
// liblog is not directly used by us, but it's a transitive dependency of libbase
|
||||
"liblog",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "modem_log_dumper",
|
||||
srcs: [ "modem_log_dumper.cpp" ],
|
||||
defaults: [ "modem_log_dumper_defaults" ],
|
||||
export_shared_lib_headers: modem_log_dumper_public_deps,
|
||||
export_include_dirs: [ "include" ],
|
||||
vendor_available: true,
|
||||
}
|
||||
|
||||
// dump_modemlog
|
||||
|
||||
cc_binary {
|
||||
name: "dump_modemlog",
|
||||
srcs: ["dump_modemlog.cpp"],
|
||||
srcs: [ "dump_modemlog.cpp" ],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
|
@ -28,17 +50,27 @@ cc_binary {
|
|||
"libbase",
|
||||
"libdump",
|
||||
"liblog",
|
||||
"modem_android_property_manager_impl",
|
||||
"modem_log_dumper",
|
||||
],
|
||||
defaults: [ "dump_modemlog_defaults" ],
|
||||
vendor: true,
|
||||
relative_install_path: "dump",
|
||||
}
|
||||
|
||||
cc_test {
|
||||
name: "dump_modemlog_test",
|
||||
srcs: [ "*_test.cpp" ],
|
||||
defaults: [ "dump_modemlog_defaults" ],
|
||||
local_include_dirs: [ "test/include" ],
|
||||
static_libs: [ "libgmock" ],
|
||||
srcs: [ "modem_log_dumper_test.cpp" ],
|
||||
defaults: [
|
||||
"modem_log_dumper_defaults",
|
||||
"modem_android_property_manager_fake_defaults",
|
||||
],
|
||||
static_libs: [
|
||||
"modem_log_dumper",
|
||||
"modem_android_property_manager_fake",
|
||||
"libgmock",
|
||||
],
|
||||
vendor: true,
|
||||
// Shared libs in vendor folder are guarded by SEPolicy, so tests need root
|
||||
// access to run them.
|
||||
require_root: true,
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue