From e366fa08b6dbb0f698db1ac2b8828990ea6cde83 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 28 Oct 2016 16:39:15 -0700 Subject: [PATCH] Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6 Partial cherry-pick of commit 7ad1110ecd6a840fcd2895c62668828a1ca029c6. Test: m Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d --- libs/androidfw/Android.bp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 5d12d9507c22c..11989627c7088 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -64,7 +64,16 @@ cc_library { shared: { enabled: false, }, - shared_libs: ["libz-host"], + static_libs: [ + "libziparchive", + "libbase", + "liblog", + "libcutils", + "libutils", + ], + shared_libs: [ + "libz-host", + ], }, windows: { enabled: true,