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

fs_mgr/libsnapshot/Android.bp

+9 −7

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

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

+11 −1