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

Commit 852b64e5 authored Feb 20, 2019 by Martin Stjernholm

Fix libdexfile dependencies to avoid direct dependency on libdexfile_external.

It should be dlopen'ed lazily by libdexfile_support now.

Also change debuggerd_test to not link libunwindstack and its dependencies
statically - the static libs can overlap with the dynamic ones.

Test: mmma system/core/debuggerd/
Test: atest debuggerd_test
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests (cannot get atest to work)
Bug: 124827589
Bug: 123186083
Change-Id: I9e7bf9bcbae499af4e1be4c9854bce441e2a7b55

parent d39f262a

debuggerd/Android.bp

+1 −3

Original line number	Diff line number	Diff line
		@@ -218,13 +218,11 @@ cc_test {
		"liblog",
		"libminijail",
		"libnativehelper",
		"libunwindstack",
		],

		static_libs: [
		"libdebuggerd",
		"libdexfile_external", // libunwindstack dependency
		"libdexfile_support", // libunwindstack dependency
		"libunwindstack",
		],

		local_include_dirs: [

libunwindstack/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ cc_library {
		"DexFiles.cpp",
		],
		exclude_shared_libs: [
		"libdexfile_external",
		"libdexfile_support",
		],
		},
		@@ -106,7 +105,6 @@ cc_library {
		"DexFiles.cpp",
		],
		exclude_shared_libs: [
		"libdexfile_external",
		"libdexfile_support",
		],
		},
		@@ -137,7 +135,6 @@ cc_library {

		shared_libs: [
		"libbase",
		"libdexfile_external",
		"libdexfile_support",
		"liblog",
		"liblzma",