Merge "Benchmark: Change library names to begin with libmediabenchmark" am: e4f759b51b (ddb41dac) · Commits · e / os / android_frameworks_av

media/tests/benchmark/src/native/common/Android.bp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -15,10 +15,10 @@
	*/		*/

	cc_library_static {		cc_library_static {
	name: "libbenchmark_common",		name: "libmediabenchmark_common",
	defaults: [		defaults: [
	"libbenchmark-defaults",		"libmediabenchmark-defaults",
	"libbenchmark_soft_sanitize_all-defaults",		"libmediabenchmark_soft_sanitize_all-defaults",
	],		],

	srcs: [		srcs: [
	@@ -32,19 +32,19 @@ cc_library_static {
	}		}

	cc_defaults {		cc_defaults {
	name: "libbenchmark_common-defaults",		name: "libmediabenchmark_common-defaults",

	defaults: [		defaults: [
	"libbenchmark-defaults",		"libmediabenchmark-defaults",
	],		],

	static_libs: [		static_libs: [
	"libbenchmark_common",		"libmediabenchmark_common",
	],		],
	}		}

	cc_defaults {		cc_defaults {
	name: "libbenchmark-defaults",		name: "libmediabenchmark-defaults",

	shared_libs: [		shared_libs: [
	"libmediandk",		"libmediandk",
	@@ -61,7 +61,7 @@ cc_defaults {
	// public dependency for native implementation		// public dependency for native implementation
	// to be used by code under media/benchmark/* only		// to be used by code under media/benchmark/* only
	cc_defaults {		cc_defaults {
	name: "libbenchmark_soft_sanitize_all-defaults",		name: "libmediabenchmark_soft_sanitize_all-defaults",

	sanitize: {		sanitize: {
	misc_undefined: [		misc_undefined: [

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -15,15 +15,15 @@
	*/		*/

	cc_library_static {		cc_library_static {
	name: "libbenchmark_decoder",		name: "libmediabenchmark_decoder",
	defaults: [		defaults: [
	"libbenchmark_common-defaults",		"libmediabenchmark_common-defaults",
	"libbenchmark_soft_sanitize_all-defaults",		"libmediabenchmark_soft_sanitize_all-defaults",
	],		],

	srcs: ["Decoder.cpp"],		srcs: ["Decoder.cpp"],

	static_libs: ["libbenchmark_extractor"],		static_libs: ["libmediabenchmark_extractor"],

	export_include_dirs: ["."],		export_include_dirs: ["."],

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -15,16 +15,16 @@
	*/		*/

	cc_library_static {		cc_library_static {
	name: "libbenchmark_encoder",		name: "libmediabenchmark_encoder",
	defaults: [		defaults: [
	"libbenchmark_common-defaults",		"libmediabenchmark_common-defaults",
	"libbenchmark_soft_sanitize_all-defaults",		"libmediabenchmark_soft_sanitize_all-defaults",
	],		],

	srcs: ["Encoder.cpp"],		srcs: ["Encoder.cpp"],

	static_libs: ["libbenchmark_extractor",		static_libs: ["libmediabenchmark_extractor",
	"libbenchmark_decoder",		"libmediabenchmark_decoder",
	],		],

	export_include_dirs: ["."],		export_include_dirs: ["."],

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,10 +15,10 @@
	*/		*/

	cc_library_static {		cc_library_static {
	name: "libbenchmark_extractor",		name: "libmediabenchmark_extractor",
	defaults: [		defaults: [
	"libbenchmark_common-defaults",		"libmediabenchmark_common-defaults",
	"libbenchmark_soft_sanitize_all-defaults",		"libmediabenchmark_soft_sanitize_all-defaults",
	],		],

	srcs: ["Extractor.cpp"],		srcs: ["Extractor.cpp"],

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -15,15 +15,15 @@
	*/		*/

	cc_library_static {		cc_library_static {
	name: "libbenchmark_muxer",		name: "libmediabenchmark_muxer",
	defaults: [		defaults: [
	"libbenchmark_common-defaults",		"libmediabenchmark_common-defaults",
	"libbenchmark_soft_sanitize_all-defaults",		"libmediabenchmark_soft_sanitize_all-defaults",
	],		],

	srcs: ["Muxer.cpp"],		srcs: ["Muxer.cpp"],

	static_libs: ["libbenchmark_extractor"],		static_libs: ["libmediabenchmark_extractor"],

	export_include_dirs: ["."],		export_include_dirs: ["."],