From 0093f6ae04e8ce2d60437cab31892815e112de62 Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Mon, 11 Jul 2022 22:12:39 +0800 Subject: [PATCH] Rename fuse_media.o to fuseMedia.o Underscore character may cause bpf prog/map naming collision. For example, x.o with map y_z and x_y.o with map z both result in x_y_z prog/map name, which should be prevented during compile-time. aosp/2147825 will prohibit underscore character in bpf source name (source name derives the obj name). Existing bpf modules with underscore characters in source name need to be updated accordingly. Bug: 236706995 Test: build Change-Id: Ie6ea47560b1d44de0a0d9d124e17616fee6b0922 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 69907b6..6fb9c6c 100644 --- a/Android.bp +++ b/Android.bp @@ -190,7 +190,7 @@ cc_binary { required: [ "mke2fs", "vold_prepare_subdirs", - "fuse_media.o", + "fuseMedia.o", ], shared_libs: [