commit 58f86bc3cb04a95bdf32f6a7f16e118ae8f45b14
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 13 08:13:58 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 13 08:13:58 2017 +0000
tree 36fceda87f238a7b534acafca254fe0bd46a94d7
parent 40b93c49920e0d1a2da7b3231eded464370fb803
parent a5304fb28b079b3980ff094cbeb604aa217d21e9

Snap for 4393550 from a5304fb28b079b3980ff094cbeb604aa217d21e9 to pi-release

Change-Id: I4edd37d84e9d8ac9da83f45cf526817b108361e9

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