summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJiyong Park2018-06-19 02:55:05 -0500
committerJiyong Park2018-06-19 02:55:05 -0500
commit012171d3af2f94b03284fd7ef35a768bba965421 (patch)
tree03bc950652eef231a17bdad62caf064bc02ccda4 /init
parentc733e5af3c4e5d712380d37f7ffcd74862c62b14 (diff)
downloadplatform-system-core-012171d3af2f94b03284fd7ef35a768bba965421.tar.gz
platform-system-core-012171d3af2f94b03284fd7ef35a768bba965421.tar.xz
platform-system-core-012171d3af2f94b03284fd7ef35a768bba965421.zip
libselinux is dynamically linked from init
init is now dynamically linked to libselinux. This gives us about 100KB extra space, which is valuable in the recovery partition. Bug: 63673171 Test: m -j Test: adb reboot recovery Change-Id: I72c4f886cbbb9ce54f8221f05547f5b9f0e1adb0
Diffstat (limited to 'init')
-rw-r--r--init/Android.bp2
-rw-r--r--init/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/init/Android.bp b/init/Android.bp
index 7d863c884..cf7637f96 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -76,7 +76,6 @@ cc_defaults {
76 "libprotobuf-cpp-lite", 76 "libprotobuf-cpp-lite",
77 "libpropertyinfoserializer", 77 "libpropertyinfoserializer",
78 "libpropertyinfoparser", 78 "libpropertyinfoparser",
79 "libselinux",
80 ], 79 ],
81 shared_libs: [ 80 shared_libs: [
82 "libcutils", 81 "libcutils",
@@ -87,6 +86,7 @@ cc_defaults {
87 "libc++", 86 "libc++",
88 "libdl", 87 "libdl",
89 "libz", 88 "libz",
89 "libselinux",
90 ], 90 ],
91} 91}
92 92
diff --git a/init/Android.mk b/init/Android.mk
index da27a73f4..a81a0f6b0 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -61,7 +61,6 @@ LOCAL_STATIC_LIBRARIES := \
61 libseccomp_policy \ 61 libseccomp_policy \
62 libcrypto_utils \ 62 libcrypto_utils \
63 libsparse \ 63 libsparse \
64 libselinux \
65 libprocessgroup \ 64 libprocessgroup \
66 libavb \ 65 libavb \
67 libkeyutils \ 66 libkeyutils \
@@ -76,6 +75,7 @@ shared_libs := \
76 libcrypto \ 75 libcrypto \
77 libdl \ 76 libdl \
78 libz \ 77 libz \
78 libselinux \
79 79
80ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) 80ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
81# init is static executable for non-system-as-root devices, because the dynamic linker 81# init is static executable for non-system-as-root devices, because the dynamic linker