Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cfa0060 authored Sep 27, 2017 by Dan Willemsen

Rename libz-host -> libz

Test: m host
Change-Id: Ib276431d13b3e1bd243f84a80f69aafc12e71aac

parent 61578ab5

libsparse/Android.bp

+4 −12

Original line number	Diff line number	Diff line
		@@ -15,19 +15,11 @@ cc_library {
		cflags: ["-Werror"],
		local_include_dirs: ["include"],
		export_include_dirs: ["include"],
		target: {
		host: {
		shared_libs: [
		"libz-host",
		"libbase",
		],
		},
		android: {
		shared_libs: [
		"libz",
		"libbase",
		],
		},
		target: {
		windows: {
		enabled: true,
		},

libziparchive/Android.bp

+2 −12

Original line number	Diff line number	Diff line
		@@ -69,11 +69,11 @@ cc_library {
		shared_libs: [
		"liblog",
		"libbase",
		"libz",
		],
		target: {
		android: {
		shared_libs: [
		"libz",
		"libutils",
		],
		},
		@@ -81,18 +81,8 @@ cc_library {
		static_libs: ["libutils"],
		},
		linux_bionic: {
		static_libs: ["libz"],
		enabled: true,
		},
		linux: {
		shared_libs: ["libz-host"],
		},
		darwin: {
		shared_libs: ["libz-host"],
		},
		windows: {
		shared_libs: ["libz-host"],
		},
		},
		}

		@@ -105,7 +95,7 @@ cc_library {
		"libziparchive_defaults",
		"libziparchive_flags",
		],
		shared_libs: ["libz-host"],
		shared_libs: ["libz"],
		static_libs: ["libutils"],
		}