Merge "Add '-unstable' to solve ODR violation" (ee0a9bff) · Commits · e / os / android_frameworks_av

media/libaudioclient/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,14 +118,14 @@ cc_library_shared {
		export_header_lib_headers: ["libaudioclient_headers"],
		export_static_lib_headers: [
		"effect-aidl-cpp",
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],

		static_libs: [
		"effect-aidl-cpp",
		// for memory heap analysis
		"libc_malloc_debug_backtrace",
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		cflags: [
		"-Wall",

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,12 +15,12 @@ cc_library {
		"libbinder",
		"libshmemutil",
		"libutils",
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		export_shared_lib_headers: [
		"libbinder",
		"libutils",
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		}

		@@ -29,10 +29,10 @@ cc_library {
		export_include_dirs: ["include"],
		srcs: ["ShmemUtil.cpp"],
		shared_libs: [
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		export_shared_lib_headers: [
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		}

		@@ -44,7 +44,7 @@ cc_test {
		"libshmemcompat",
		"libshmemutil",
		"libutils",
		"shared-file-region-aidl-cpp",
		"shared-file-region-aidl-unstable-cpp",
		],
		test_suites: ["device-tests"],
		}