diff options
author | Tao Bao <tbao@google.com> | 2017-10-11 17:17:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 17:17:36 +0000 |
commit | a5304fb28b079b3980ff094cbeb604aa217d21e9 (patch) | |
tree | 36fceda87f238a7b534acafca254fe0bd46a94d7 | |
parent | a74560aaf6a8861cbb81a8a6a7c66b323cc6417c (diff) | |
parent | 757884d3a8acac08a4d6da4bbbc8794278f7c8de (diff) | |
download | bzip2-a5304fb28b079b3980ff094cbeb604aa217d21e9.tar.gz |
Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4 am: 15597ad460android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
am: 757884d3a8
Change-Id: Ifd89583530d08a0f37095ffb836605ea0c0131f3
-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", |