Revert "Add package config for zlib"
Breakage w/ shlib toolchain
This reverts commit 3a83e7c2e2d27d6344cad252348593d4886923a8.
Change-Id: I491b4230603d2f40a0a10f1e00e67c1470e3f40e
diff --git a/BUILD.gn b/BUILD.gn
index 5480898..b5a7c51 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -26,8 +26,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import("//packages/package.gni")
-
config("zlib_config") {
include_dirs = [ "." ]
}
@@ -35,7 +33,9 @@
config("zlib_warnings") {
visibility = [ ":*" ]
- cflags = [ "-Wno-implicit-function-declaration" ]
+ cflags = [
+ "-Wno-implicit-function-declaration",
+ ]
}
shared_library("zlib") {
@@ -77,7 +77,9 @@
config("minizip_warnings") {
visibility = [ ":*" ]
- cflags = [ "-Wno-implicit-function-declaration" ]
+ cflags = [
+ "-Wno-implicit-function-declaration",
+ ]
if (is_clang) {
# minizip uses `if ((a == b))` for some reason.
@@ -96,28 +98,8 @@
"contrib/minizip/zip.h",
]
- deps = [
- ":zlib",
- ]
+ deps = [ ":zlib" ]
configs += [ ":minizip_warnings" ]
configs -= [ "//build/config:symbol_visibility_hidden" ]
public_configs = [ ":zlib_config" ]
}
-
-package("package") {
- package_name = "zlib"
- deps = [
- ":minizip",
- ":zlib",
- ]
-
- libraries = [
- {
- name = "libz.so"
- },
-
- {
- name = "libminizip.so"
- },
- ]
-}
