diff options
author | Tao Bao <tbao@google.com> | 2017-10-11 17:12:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 17:12:17 +0000 |
commit | 757884d3a8acac08a4d6da4bbbc8794278f7c8de (patch) | |
tree | 36fceda87f238a7b534acafca254fe0bd46a94d7 | |
parent | ecfb9a27819cbfef804d093c2f0fecc3de9d8252 (diff) | |
parent | 15597ad4606b815d6224e200e9b13a035be5a35f (diff) | |
download | bzip2-757884d3a8acac08a4d6da4bbbc8794278f7c8de.tar.gz |
Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
am: 15597ad460
Change-Id: I6564fe94fdf6912ac25474bd485868b58a0228d4
-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", |