When we added android_get_control_file() call from libcutils into libpackagelistparser, which in turn is referenced by libselinux, the static build of toybox failed. A minor reordering of the libraries resolves this build problem. (patch enclosed)

-- Mark

>From 51aa19e54d363a5dd0a826e86b5effd84ddd8c6a Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <saly...@android.com>
Date: Mon, 1 May 2017 15:21:17 -0700
Subject: [PATCH] libselinux can depend on libcutils

static library ordering to deal with libselinux depending on
libcutils.  In preparation to enhance libpackagelistparser.

Signed-off-by: Mark Salyzyn <saly...@android.com>
Bug: 36645158
Bug: 37751120
Change-Id: Ida0d825847ccef423c55849e7fc52be5cdcc5f5b
---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 31a70934..1008468b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -237,7 +237,7 @@ LOCAL_CFLAGS := $(common_CFLAGS)
 
 LOCAL_CLANG := true
 
-LOCAL_SHARED_LIBRARIES := liblog libcutils libselinux libcrypto
+LOCAL_SHARED_LIBRARIES := liblog libselinux libcutils libcrypto
 
 # This doesn't actually prevent us from dragging in libc++ at runtime
 # because libnetd_client.so is C++.
@@ -414,7 +414,7 @@ LOCAL_CFLAGS := $(common_CFLAGS)
 
 LOCAL_CLANG := true
 
-LOCAL_STATIC_LIBRARIES := liblog libcutils libselinux libcrypto libm libc
+LOCAL_STATIC_LIBRARIES := liblog libselinux libcutils libcrypto libm libc
 
 # libc++_static is needed by static liblog
 LOCAL_CXX_STL := libc++_static
-- 
2.13.0.rc0.306.g87b477812d-goog

_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Reply via email to