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

Commit 80d0f4c6 authored Feb 26, 2021 by Yurii Zubrytskyi

[hardening] Switch to hardened libziparchive in system_server

Use the new libziparchive_hardened in all system_server
dependencies to ensure no missing page access can crash
the process

Bug: 160635079
Test: IncrementalService tests + adb install --incremental
Change-Id: I1c664e111b69718cd9c62fc3e0d6a5dc70bed16b

parent 4183c1d4

core/jni/Android.bp

+1 −2

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

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

		export_include_dirs: [
		".",

libs/androidfw/Android.bp

+1 −1

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

libs/hwui/Android.bp

+1 −2

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

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

		target: {
		android: {

services/incremental/Android.bp

+1 −1

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