Merge changes from topic "init_defaults"

* changes:
  init: Build init_tests only for the first arch.
  init: init_defaults uses more shared libraries.
This commit is contained in:
Tao Bao 2018-08-24 21:48:41 +00:00 committed by Gerrit Code Review
commit eff7027a8c
1 changed files with 9 additions and 17 deletions

View File

@ -59,33 +59,24 @@ cc_defaults {
},
},
static_libs: [
"libbootloader_message",
"libfs_mgr",
"libfec",
"libfec_rs",
"libhidl-gen-utils",
"libsquashfs_utils",
"liblogwrap",
"libext4_utils",
"libseccomp_policy",
"libcrypto_utils",
"libsparse",
"libprocessgroup",
"libavb",
"libkeyutils",
"libprotobuf-cpp-lite",
"libpropertyinfoserializer",
"libpropertyinfoparser",
],
shared_libs: [
"libcutils",
"libbase",
"libc",
"liblog",
"libcrypto",
"libc++",
"libbootloader_message",
"libcutils",
"libdl",
"libz",
"libext4_utils",
"libfs_mgr",
"libhidl-gen-utils",
"libkeyutils",
"liblog",
"liblogwrap",
"libselinux",
],
}
@ -160,6 +151,7 @@ cc_binary {
cc_test {
name: "init_tests",
defaults: ["init_defaults"],
compile_multilib: "first",
srcs: [
"devices_test.cpp",
"init_test.cpp",