Commit bd2d961c authored Aug 04, 2015 by William Roberts Committed by dcashman Oct 22, 2015

init/adb: correct static lib dependencies for libselinux



Now that libselinux uses libpackagelistparser, in order
for libpackagelistparser to be properly statically linked
liblog must come after libselinux for all the liblog
references to be defined in libpackagelistparser which
is included in libselinux. This patch corrects that order.

Change-Id: I7aee10c9395310919779ed2463aab6b2f8b380cc
Signed-off-by: William Roberts <william.c.roberts@intel.com>

parent c52b3c08

adb/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -296,9 +296,9 @@ LOCAL_STATIC_LIBRARIES := \
		libfs_mgr \
		libfec \
		libfec_rs \
		libselinux \
		liblog \
		libmincrypt \
		libselinux \
		libext4_utils_static \
		libsquashfs_utils \
		libcutils \

init/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,9 +92,9 @@ LOCAL_STATIC_LIBRARIES := \
		libbase \
		libext4_utils_static \
		libutils \
		liblog \
		libc \
		libselinux \
		liblog \
		libmincrypt \
		libcrypto_static \
		libc++_static \