tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch imgdiff to use libz_stable am: 2f2749f213

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0cffbe8dcaa73377be32a7bee448e8b748c7c9f
This commit is contained in:
Kelvin Zhang 2021-01-14 15:40:20 +00:00 committed by Automerger Merge Worker
commit 9997438c1c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
applypatch/Android.bp
View file

@ -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",
],
}

3
tests/Android.bp
View file

@ -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",
]