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

Commit 9d75c9cb authored Aug 08, 2024 by Treehugger Robot Committed by Automerger Merge Worker Aug 08, 2024

Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main...

Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main am: 9da55b8c am: 654bee33

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

Change-Id: I77b9bb2fb3fd51f3e40ef1316999f2da462108cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b3b45393 654bee33

fs_mgr/libsnapshot/Android.bp

+7 −9

Original line number	Diff line number	Diff line
		@@ -281,17 +281,9 @@ 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 {
		@@ -324,6 +316,12 @@ 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",
		},
		],
		},
		}

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −11

Original line number	Diff line number	Diff line
		@@ -238,19 +238,9 @@ cc_defaults {
		test_options: {
		min_shipping_api_level: 30,
		},

		compile_multilib: "both",
		multilib: {
		lib32: {
		suffix: "32",
		},
		lib64: {
		suffix: "64",
		},
		},

		auto_gen_config: true,
		require_root: true,
		compile_multilib: "first",
		}

		cc_test {