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

Commit 2f2749f2 authored Jan 12, 2021 by Kelvin Zhang

Switch imgdiff to use libz_stable

libz contain platform dependent optimization flags, and sometimes that
cause reconstruction of blobs to fail. Use libz_stable instead

Bug: 177076632
Test: treehugger

Change-Id: I3a8c1591672537d1c754b2bc5b26f939dd80ed47

parent 043ef5ff

applypatch/Android.bp

+8 −7

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ cc_library_static {
		"libbz",
		"libedify",
		"libotautil",
		"libz",
		"libz_stable",
		],

		shared_libs: [
		@@ -71,6 +71,7 @@ cc_library_static {
		cc_library_static {
		name: "libapplypatch_modes",
		vendor_available: true,
		host_supported: true,

		defaults: [
		"applypatch_defaults",
		@@ -95,6 +96,7 @@ cc_library_static {
		cc_binary {
		name: "applypatch",
		vendor: true,
		host_supported: true,

		defaults: [
		"applypatch_defaults",
		@@ -120,7 +122,7 @@ cc_binary {
		"libbase",
		"libcrypto",
		"liblog",
		"libz",
		"libz_stable",
		"libziparchive",
		],

		@@ -129,9 +131,9 @@ cc_binary {
		],
		}

		cc_library_host_static {
		cc_library_static {
		name: "libimgdiff",

		host_supported: true,
		defaults: [
		"applypatch_defaults",
		],
		@@ -152,14 +154,13 @@ cc_library_host_static {
		"liblog",
		"libotautil",
		"libutils",
		"libz",
		"libz_stable",
		"libziparchive",
		],
		}

		cc_binary_host {
		name: "imgdiff",

		srcs: [
		"imgdiff_main.cpp",
		],
		@@ -180,6 +181,6 @@ cc_binary_host {
		"liblog",
		"libbrotli",
		"libbz",
		"libz",
		"libz_stable",
		],
		}

tests/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ cc_defaults {
		"libpng",
		"libprocessgroup",
		"libselinux",
		"libz",
		"libziparchive",
		],

		@@ -65,7 +64,7 @@ libapplypatch_static_libs = [
		"libbase",
		"libbrotli",
		"libbz",
		"libz",
		"libz_stable",
		"libziparchive",
		]