From 367a90c91d37204cd399a5e22a21c52c281a0173 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 27 Sep 2017 16:11:57 -0700 Subject: [PATCH] AOSP: Rename libz-host -> libz Test: m host Change-Id: I8b0edfe2076531bd4c4f1023b1076aec5f722a44 From AOSP commit: d4356bb606dbcad0b77788318c6199081262b373 --- contrib/android/Android.bp | 10 +--------- lib/ext2fs/Android.bp | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp index 18d3850..b4810a4 100644 --- a/contrib/android/Android.bp +++ b/contrib/android/Android.bp @@ -61,14 +61,6 @@ cc_binary { "libext2fs", "libext2_com_err", "libsparse", + "libz", ], - - target: { - host: { - shared_libs: ["libz-host"], - }, - android: { - shared_libs: ["libz"], - }, - }, } diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index cc28de1..62bcba4 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -89,6 +89,7 @@ cc_library { ], shared_libs: [ "libsparse", + "libz", ], whole_static_libs: [ "libext2_com_err" @@ -101,7 +102,6 @@ cc_library { ], target: { host: { - shared_libs: ["libz-host"], // Consider removing this library as a whole for the host. It is not // in the android side. whole_static_libs: ["libext2_com_err"], @@ -110,7 +110,6 @@ cc_library { shared_libs: [ "libext2_com_err", "libext2_uuid", - "libz" ], }, windows: { -- 1.8.3.1