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

Commit 1180590c authored Mar 11, 2021 by Yurii Zubrytskyi Committed by Android (Google) Code Review Mar 11, 2021

Merge "[hardening] Switch to hardened libziparchive in system_server" into sc-dev

parents a61de115 80d0f4c6

core/jni/Android.bp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -69,10 +69,9 @@ cc_library_shared {
	"liblog",		"liblog",
	"libminikin",		"libminikin",
	"libz",		"libz",
	"libziparchive",
	],		],

	static_libs: ["libnativehelper_lazy"],		static_libs: ["libnativehelper_lazy", "libziparchive_for_incfs", ],

	export_include_dirs: [		export_include_dirs: [
	".",		".",

libs/androidfw/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,8 +97,8 @@ cc_library {
	"libincfs",		"libincfs",
	"libutils",		"libutils",
	"libz",		"libz",
	"libziparchive",
	],		],
			static_libs: ["libziparchive_for_incfs"],
	static: {		static: {
	enabled: false,		enabled: false,
	},		},

libs/hwui/Android.bp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -388,11 +388,10 @@ cc_defaults {
	"liblog",		"liblog",
	"libminikin",		"libminikin",
	"libz",		"libz",
	"libziparchive",
	"libjpeg",		"libjpeg",
	],		],

	static_libs: ["libnativehelper_lazy"],		static_libs: ["libnativehelper_lazy", "libziparchive_for_incfs"],

	target: {		target: {
	android: {		android: {

services/incremental/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ cc_defaults {
	"libutils",		"libutils",
	"libvold_binder",		"libvold_binder",
	"libc++fs",		"libc++fs",
			"libziparchive_for_incfs",
	],		],
	shared_libs: [		shared_libs: [
	"libandroidfw",		"libandroidfw",
	@@ -77,7 +78,6 @@ cc_defaults {
	"libincfs",		"libincfs",
	"liblog",		"liblog",
	"libz",		"libz",
	"libziparchive",
	],		],
	}		}