summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-06-14 22:26:10 -0700
committerColin Cross <ccross@android.com>2013-06-14 22:26:10 -0700
commitd8d0d5cef636d5456bf5f3645959409bdc5499aa (patch)
treed6de97982450d6f059bf771b05f119d56ca1518b
parent5c6008a533eb08c61af02b8018bcc956ad5a570f (diff)
downloadchromium-kitkat-mr1-release.tar.gz
LOCAL_WHOLE_STATIC_LIBRARIES is almost never what you want, it is generally used when you want a shared library to export the symbols from a static library to the users of the shared library. In this case it appears unnecessary, because there are no unresolved symbols when LOCAL_WHOLE_STATIC_LIBRARIES is replaced with LOCAL_STATIC_LIBRARIES. In addition, libcutils was listed in LOCAL_WHOLE_STATIC_LIBRARIES as well as LOCAL_SHARED_LIBRARIES. There is no need to link statically against libcutils, so remove it from LOCAL_STATIC_LIBRARIES. Change-Id: I983e74861bab7a5390bd2fa5b7c9b6e59c634152
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 2455f781..b3d7e624 100644
--- a/Android.mk
+++ b/Android.mk
@@ -478,7 +478,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
$(LOCAL_C_INCLUDES)
-LOCAL_WHOLE_STATIC_LIBRARIES += libevent modp_b64 dmg_fp libcutils
+LOCAL_STATIC_LIBRARIES := libevent modp_b64 dmg_fp
LOCAL_SHARED_LIBRARIES := libstlport libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils liblog libdl
LOCAL_PRELINK_MODULE := false