From 12edfc7b60e8a70e91b51e14722841a3844fd573 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Tue, 24 Jan 2023 14:14:18 -0800 Subject: Allow the binary to be used in tests. Bug: 253568736 Test: atest com.android.server.pm.test.SettingsTest Change-Id: Idbcf30009587976e927f591e4b91a31c41c821f3 --- Android.bp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Android.bp b/Android.bp index d7abc42..cceff30 100644 --- a/Android.bp +++ b/Android.bp @@ -51,6 +51,15 @@ cc_binary { "programs/fsverity.c", "programs/utils.c", ], + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, + }, } cc_library { -- cgit v1.2.3 From 435e07ffcde1cb85fe2b073a10e9d3c81218ac76 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Tue, 24 Jan 2023 20:02:46 -0800 Subject: Move multilib to be a separate build target. Bug: 266636594 Fixes: 266636594 Test: builds Change-Id: I9c036e8cad54a1dcf153a912c80b1af4bd00acd5 --- Android.bp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Android.bp b/Android.bp index cceff30..560c5a2 100644 --- a/Android.bp +++ b/Android.bp @@ -51,6 +51,20 @@ cc_binary { "programs/fsverity.c", "programs/utils.c", ], +} + +cc_binary { + name: "fsverity_multilib", + defaults: [ + "fsverity_default_flags", + ], + host_supported: true, + shared_libs: ["libfsverity"], + srcs: [ + "programs/cmd_*.c", + "programs/fsverity.c", + "programs/utils.c", + ], compile_multilib: "both", multilib: { lib32: { -- cgit v1.2.3