Merge "update aconfig lib setup for host test" into main (35918fe8) · Commits · e / os / android_frameworks_av

camera/Android.bp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,13 @@ aconfig_declarations {
	cc_aconfig_library {		cc_aconfig_library {
	name: "camera_platform_flags_c_lib",		name: "camera_platform_flags_c_lib",
	aconfig_declarations: "camera_platform_flags",		aconfig_declarations: "camera_platform_flags",
			}

			cc_aconfig_library {
			name: "camera_platform_flags_c_lib_for_test",
			aconfig_declarations: "camera_platform_flags",
	host_supported: true,		host_supported: true,
			mode: "test",
	}		}

	java_aconfig_library {		java_aconfig_library {

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -265,8 +265,20 @@ cc_library_static {
	"liblog",		"liblog",
	"libutils",		"libutils",
	"libxml2",		"libxml2",
			],

			target: {
			android: {
			shared_libs: [
	"camera_platform_flags_c_lib",		"camera_platform_flags_c_lib",
	],		],
			},
			host: {
			shared_libs: [
			"camera_platform_flags_c_lib_for_test",
			],
			},
			},

	include_dirs: [		include_dirs: [
	"frameworks/av/camera/include",		"frameworks/av/camera/include",

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,13 +44,25 @@ cc_defaults {
	"libjpeg",		"libjpeg",
	"liblog",		"liblog",
	"libutils",		"libutils",
	"camera_platform_flags_c_lib",
	],		],

	static_libs: [		static_libs: [
	"libgmock",		"libgmock",
	],		],

			target: {
			android: {
			shared_libs: [
			"camera_platform_flags_c_lib",
			],
			},
			host: {
			shared_libs: [
			"camera_platform_flags_c_lib_for_test",
			],
			},
			},

	cflags: [		cflags: [
	"-Wall",		"-Wall",
	"-Wextra",		"-Wextra",