Merge "Remove libunwindstack_dex" am: ff9b1db67c (26097100) · Commits · e / os / android_system_core

libunwindstack/Android.bp

+9 −74

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ cc_library {

		srcs: [
		"ArmExidx.cpp",
		"DexFile.cpp",
		"DexFiles.cpp",
		"DwarfCfa.cpp",
		"DwarfEhFrameWithHdr.cpp",
		"DwarfMemory.cpp",
		@@ -85,11 +87,13 @@ cc_library {
		},
		vendor: {
		cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
		exclude_static_libs: ["libunwindstack_dex"],
		exclude_srcs: [
		"DexFile.cpp",
		"DexFiles.cpp",
		],
		exclude_shared_libs: ["libdexfile"],
		},
		},
		whole_static_libs: ["libunwindstack_dex"],

		arch: {
		x86: {
		@@ -114,79 +118,9 @@ cc_library {
		],
		}

		// Isolate the dex file processing into a separate library. Currently,
		// it is necessary to add art include directories directly, which also
		// adds the art elf.h file in the include path, overriding the system one.
		// Work to isolate libdexfile is b/72216369.
		cc_library_static {
		name: "libunwindstack_dex",
		vendor_available: false,
		defaults: ["libunwindstack_flags"],

		cflags: [
		"-Wexit-time-destructors",
		],

		srcs: [
		"DexFile.cpp",
		"DexFiles.cpp",
		],
		target: {
		// Always disable optimizations for host to make it easier to debug.
		host: {
		cflags: [
		"-O0",
		"-g",
		],
		},
		},

		shared_libs: [
		"libbase",
		"libdexfile",
		],
		local_include_dirs: ["include"],
		allow_undefined_symbols: true,

		// libdexfile will eventually properly export headers, for now include
		// these directly.
		include_dirs: [
		"art/runtime",
		],
		}

		//-------------------------------------------------------------------------
		// Unit Tests
		//-------------------------------------------------------------------------
		cc_test_library {
		name: "libunwindstack_dex_test",
		vendor_available: false,
		defaults: ["libunwindstack_flags"],

		shared: {
		enabled: false,
		},

		srcs: [
		"tests/DexFileTest.cpp",
		"tests/DexFilesTest.cpp",
		],
		local_include_dirs: ["include"],
		allow_undefined_symbols: true,

		shared_libs: [
		"libbase",
		"libunwindstack",
		"libdexfile",
		],

		// libdexfile will eventually properly export headers, for now include
		// these directly.
		include_dirs: [
		"art/runtime",
		],
		}

		cc_test {
		name: "libunwindstack_test",
		defaults: ["libunwindstack_flags"],
		@@ -194,6 +128,8 @@ cc_test {
		srcs: [
		"tests/ArmExidxDecodeTest.cpp",
		"tests/ArmExidxExtractTest.cpp",
		"tests/DexFileTest.cpp",
		"tests/DexFilesTest.cpp",
		"tests/DwarfCfaLogTest.cpp",
		"tests/DwarfCfaTest.cpp",
		"tests/DwarfDebugFrameTest.cpp",
		@@ -242,14 +178,13 @@ cc_test {
		"liblog",
		"liblzma",
		"libunwindstack",
		"libdexfile",
		],

		static_libs: [
		"libgmock",
		],

		whole_static_libs: ["libunwindstack_dex_test"],

		data: [
		"tests/files/elf32.xz",
		"tests/files/elf64.xz",