Merge "libselinux is dynamically linked from init"

am: 20480a22a1

Change-Id: I0f76ee0fe718cb73818c87cb3938b517f710122b
This commit is contained in:
Jiyong Park 2018-06-19 17:10:29 -07:00 committed by android-build-merger
commit c4e89cde85
2 changed files with 2 additions and 2 deletions

View file

@ -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",
],
}

View file

@ -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