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

Commit 54100d33 authored Sep 13, 2019 by Tobias Thierer Committed by Gerrit Code Review Sep 13, 2019

Merge "Link libcrypto dynamically for recovery unit tests."

parents 0af65d8c 189d424c

applypatch/Android.bp

+8 −2

Original line number	Diff line number	Diff line
		@@ -51,12 +51,15 @@ cc_library_static {
		"libbase",
		"libbspatch",
		"libbz",
		"libcrypto",
		"libedify",
		"libotautil",
		"libz",
		],

		shared_libs: [
		"libcrypto",
		],

		target: {
		darwin: {
		enabled: false,
		@@ -78,10 +81,13 @@ cc_library_static {
		static_libs: [
		"libapplypatch",
		"libbase",
		"libcrypto",
		"libedify",
		"libotautil",
		],

		shared_libs: [
		"libcrypto",
		],
		}

		cc_binary {

minadbd/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,11 +102,11 @@ cc_test {
		"libfusesideload",
		"libotautil",
		"libadbd",
		"libcrypto",
		],

		shared_libs: [
		"libbase",
		"libcrypto",
		"libcutils",
		"liblog",
		],

tests/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ libapplypatch_static_libs = [
		"libbase",
		"libbrotli",
		"libbz",
		"libcrypto",
		"libz",
		"libziparchive",
		]

updater/Android.bp

+4 −1

Original line number	Diff line number	Diff line
		@@ -41,11 +41,14 @@ cc_defaults {
		"libziparchive",
		"libz",
		"libbase",
		"libcrypto",
		"libcrypto_utils",
		"libcutils",
		"libutils",
		],

		shared_libs: [
		"libcrypto",
		],
		}

		cc_defaults {