aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-11 16:59:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-11 16:59:41 +0000
commit94d2512ef4ba303b00cbfecef0236f53f036a364 (patch)
tree36fceda87f238a7b534acafca254fe0bd46a94d7
parent0d71f00a5f1840b7911a8d28e881802faf3b9e67 (diff)
parentec365b37878467edc746a9646da96eb91ccb12bd (diff)
downloadbzip2-o-mr1-iot-preview-6.tar.gz
Merge "Build both of static and shared libs."android-o-mr1-iot-preview-6o-mr1-iot-preview-6
am: ec365b3787 Change-Id: Ide18b0e5db46a254f3fb90def4a5211b605e94c2
-rw-r--r--Android.bp6
1 files changed, 2 insertions, 4 deletions
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_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",