commit 757884d3a8acac08a4d6da4bbbc8794278f7c8de
author Tao Bao <tbao@google.com> Wed Oct 11 17:12:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 11 17:12:17 2017 +0000
tree 36fceda87f238a7b534acafca254fe0bd46a94d7
parent ecfb9a27819cbfef804d093c2f0fecc3de9d8252
parent 15597ad4606b815d6224e200e9b13a035be5a35f

Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4
am: 15597ad460

Change-Id: I6564fe94fdf6912ac25474bd485868b58a0228d4

Android.bp

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_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",