Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb59b8f authored Sep 29, 2021 by Treehugger Robot Committed by Automerger Merge Worker Sep 29, 2021

Merge "Replace test_min_api_level with test_options.min_shipping_api_level" am: 2d7301d2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1838539

Change-Id: Ic3fb2995766540a714bf83e665553cd999587060

parents 4e8f468a 2d7301d2

fs_mgr/libdm/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,9 @@ cc_test {
	name: "vts_libdm_test",		name: "vts_libdm_test",
	defaults: ["libdm_test_defaults"],		defaults: ["libdm_test_defaults"],
	test_suites: ["vts"],		test_suites: ["vts"],
	test_min_api_level: 29,		test_options: {
			min_shipping_api_level: 29,
			},
	}		}

	cc_fuzz {		cc_fuzz {

fs_mgr/libfiemap/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,9 @@ cc_test {

	test_suites: ["vts", "device-tests"],		test_suites: ["vts", "device-tests"],
	auto_gen_config: true,		auto_gen_config: true,
	test_min_api_level: 29,		test_options: {
			min_shipping_api_level: 29,
			},
	require_root: true,		require_root: true,
	}		}

fs_mgr/liblp/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,9 @@ cc_test {
	defaults: ["liblp_test_defaults"],		defaults: ["liblp_test_defaults"],
	test_suites: ["vts"],		test_suites: ["vts"],
	auto_gen_config: true,		auto_gen_config: true,
	test_min_api_level: 29,		test_options: {
			min_shipping_api_level: 29,
			},
	require_root: true,		require_root: true,
	}		}

fs_mgr/libsnapshot/Android.bp

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -251,7 +251,9 @@ cc_defaults {
	"vts",		"vts",
	"device-tests"		"device-tests"
	],		],
	test_min_api_level: 29,		test_options: {
			min_shipping_api_level: 29,
			},
	auto_gen_config: true,		auto_gen_config: true,
	require_root: true,		require_root: true,
	}		}
	@@ -407,7 +409,9 @@ cc_test {
	test_suites: [		test_suites: [
	"device-tests"		"device-tests"
	],		],
	test_min_api_level: 30,		test_options: {
			min_shipping_api_level: 30,
			},
	auto_gen_config: true,		auto_gen_config: true,
	require_root: false,		require_root: false,
	host_supported: true,		host_supported: true,

fs_mgr/libsnapshot/snapuserd/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,9 @@ cc_test {
	"libstorage_literals_headers",		"libstorage_literals_headers",
	"libfiemap_headers",		"libfiemap_headers",
	],		],
	test_min_api_level: 30,		test_options: {
			min_shipping_api_level: 30,
			},
	auto_gen_config: true,		auto_gen_config: true,
	require_root: false,		require_root: false,
	}		}