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

camera/Android.bp

+6 −0

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

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

		java_aconfig_library {

+13 −1

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

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

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

+13 −1

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

		static_libs: [
		"libgmock",
		],

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

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