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

fs_mgr/libsnapshot/Android.bp

+10 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,6 @@ cc_defaults {
		],
		auto_gen_config: true,
		require_root: true,
		compile_multilib: "first",
		}

		cc_test {
		@@ -298,6 +297,15 @@ cc_test {
		"vts",
		"general-tests",
		],
		compile_multilib: "both",
		multilib: {
		lib32: {
		suffix: "32",
		},
		lib64: {
		suffix: "64",
		},
		},
		test_options: {
		min_shipping_api_level: 30,
		},
		@@ -315,6 +323,7 @@ cc_test {
		test_suites: [
		"general-tests",
		],
		compile_multilib: "64",
		test_options: {
		// Legacy VAB launched in Android R.
		min_shipping_api_level: 30,

+11 −1