Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main (9da55b8c) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/Android.bp

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -281,17 +281,9 @@ cc_defaults {
	header_libs: [		header_libs: [
	"libstorage_literals_headers",		"libstorage_literals_headers",
	],		],
	compile_multilib: "both",
	multilib: {
	lib32: {
	suffix: "32",
	},
	lib64: {
	suffix: "64",
	},
	},
	auto_gen_config: true,		auto_gen_config: true,
	require_root: true,		require_root: true,
			compile_multilib: "first",
	}		}

	cc_test {		cc_test {
	@@ -324,6 +316,12 @@ cc_test {
	test_options: {		test_options: {
	// Legacy VAB launched in Android R.		// Legacy VAB launched in Android R.
	min_shipping_api_level: 30,		min_shipping_api_level: 30,
			test_runner_options: [
			{
			name: "force-no-test-error",
			value: "false",
			},
			],
	},		},
	}		}

+1 −11