Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eff7027a authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge changes from topic "init_defaults" 

* changes:
  init: Build init_tests only for the first arch.
  init: init_defaults uses more shared libraries.
parents 07c2c9a5 a3d36a8c

init/Android.bp

+9 −17
Original line number Diff line number Diff line
@@ -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",