diff options
author | Tao Bao <tbao@google.com> | 2017-10-11 17:04:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 17:04:46 +0000 |
commit | 15597ad4606b815d6224e200e9b13a035be5a35f (patch) | |
tree | 36fceda87f238a7b534acafca254fe0bd46a94d7 | |
parent | 5c2c573231417ccf54f86a8ddb0250d6a894da6e (diff) | |
parent | 94d2512ef4ba303b00cbfecef0236f53f036a364 (diff) | |
download | bzip2-15597ad4606b815d6224e200e9b13a035be5a35f.tar.gz |
Merge "Build both of static and shared libs." am: ec365b3787
am: 94d2512ef4
Change-Id: I48e4c59d50959ee4ced72e0153f96b7280333385
-rw-r--r-- | Android.bp | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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", |