From 1022ede26945b23c33a33e4a08a8d74655854d29 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 10 Oct 2017 16:55:42 -0700
Subject: Build both of static and shared libs.

Also move bzip2 to use the shared library.

Test: mmma external/bzip2
Change-Id: I9e9495f79c0d2dc4a345ce840602e01cea1aa00f
---
 Android.bp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index c9c0e13..730883d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_static {
+cc_library {
     name: "libbz",
     host_supported: true,
     arch: {
@@ -45,9 +45,7 @@ cc_library_static {
 cc_binary {
     name: "bzip2",
     srcs: ["bzip2.c"],
-    // This is only static because we don't currently have libbz.so on device.
-    // If that changes, change this too.
-    static_libs: ["libbz"],
+    shared_libs: ["libbz"],
     stl: "none",
     cflags: [
         "-Werror",
-- 
cgit v1.2.3