Merge "libsnapshot: Don't run legacy tests in VTS." (c2f3d686) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/Android.bp

+21 −7

Original line number	Diff line number	Diff line
		@@ -252,13 +252,6 @@ cc_defaults {
		header_libs: [
		"libstorage_literals_headers",
		],
		test_suites: [
		"vts",
		"device-tests"
		],
		test_options: {
		min_shipping_api_level: 29,
		},
		auto_gen_config: true,
		require_root: true,
		compile_multilib: "first",
		@@ -267,6 +260,13 @@ cc_defaults {
		cc_test {
		name: "vts_libsnapshot_test",
		defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"],
		test_suites: [
		"vts",
		"device-tests"
		],
		test_options: {
		min_shipping_api_level: 30,
		},
		}

		cc_test {
		@@ -275,6 +275,13 @@ cc_test {
		cppflags: [
		"-DLIBSNAPSHOT_TEST_VAB_LEGACY",
		],
		test_suites: [
		"device-tests"
		],
		test_options: {
		// Legacy VAB launched in Android R.
		min_shipping_api_level: 30,
		},
		}

		cc_test {
		@@ -283,6 +290,13 @@ cc_test {
		cppflags: [
		"-DLIBSNAPSHOT_TEST_VABC_LEGACY",
		],
		test_suites: [
		"device-tests"
		],
		test_options: {
		// Legacy VABC launched in Android S.
		min_shipping_api_level: 31,
		},
		}

		cc_test {