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

Commit c4e89cde authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "libselinux is dynamically linked from init" 

am: 20480a22

Change-Id: I0f76ee0fe718cb73818c87cb3938b517f710122b
parents 041661fd 20480a22

init/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ cc_defaults { 
        "libprotobuf-cpp-lite",

        "libpropertyinfoserializer",

        "libpropertyinfoparser",

        "libselinux",

    ],

    shared_libs: [

        "libcutils",
@@ -87,6 +86,7 @@ cc_defaults { 
        "libc++",

        "libdl",

        "libz",

        "libselinux",

    ],

}

init/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ LOCAL_STATIC_LIBRARIES := \ 
    libseccomp_policy \

    libcrypto_utils \

    libsparse \

    libselinux \

    libprocessgroup \

    libavb \

    libkeyutils \
@@ -76,6 +75,7 @@ shared_libs := \ 
    libcrypto \

    libdl \

    libz \

    libselinux \



ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

# init is static executable for non-system-as-root devices, because the dynamic linker