diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2024-02-29 02:06:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 02:06:03 +0000 |
| commit | b39171460b624d51d52ded009b839e70eb8ee7e5 (patch) | |
| tree | c62fbe5f81aa1d2f053caaf999b4ff98e9a2a50c | |
| parent | b97284595c9fec7bd34c2bbf570afd969828386e (diff) | |
| parent | 2273a74d0049f8fa95185882e3b928ceddd77764 (diff) | |
| download | selinux-b39171460b624d51d52ded009b839e70eb8ee7e5.tar.gz | |
Merge "Add selabel_get_digests_all_partial_matches binary" into main am: 2273a74d00
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2981571
Change-Id: Icc0c501c6a3841b4bede6bdf2821c3627d6cb67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libselinux/Android.bp | 12 | ||||
| -rw-r--r-- | libselinux/utils/selabel_get_digests_all_partial_matches.c | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/libselinux/Android.bp b/libselinux/Android.bp index ff7dc3d3..766c90ed 100644 --- a/libselinux/Android.bp +++ b/libselinux/Android.bp @@ -222,6 +222,18 @@ cc_binary_host { stl: "", } +cc_binary { + name: "selabel_get_digests_all_partial_matches", + defaults: ["libselinux_defaults"], + srcs: ["utils/selabel_get_digests_all_partial_matches.c"], + + static_libs: [ + "libselinux", + ], + + stl: "", +} + rust_bindgen { name: "libselinux_bindgen", wrapper_src: "rust/selinux.h", diff --git a/libselinux/utils/selabel_get_digests_all_partial_matches.c b/libselinux/utils/selabel_get_digests_all_partial_matches.c index c4e0f836..fc518439 100644 --- a/libselinux/utils/selabel_get_digests_all_partial_matches.c +++ b/libselinux/utils/selabel_get_digests_all_partial_matches.c @@ -5,6 +5,7 @@ #include <errno.h> #include <stdbool.h> #include <fts.h> +#include <selinux/android.h> #include <selinux/selinux.h> #include <selinux/label.h> @@ -71,10 +72,14 @@ int main(int argc, char **argv) paths[0] = argv[optind]; +#ifdef ANDROID + hnd = selinux_android_file_context_handle(); +#else selabel_option[0].value = file; selabel_option[1].value = validate; hnd = selabel_open(SELABEL_CTX_FILE, selabel_option, 2); +#endif if (!hnd) { fprintf(stderr, "ERROR: selabel_open - Could not obtain " "handle: %s\n", |