diff options
| -rw-r--r-- | contrib/android/e2fsdroid.c | 5 | ||||
| -rw-r--r-- | misc/Android.bp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c index 6e514140..82bd3408 100644 --- a/contrib/android/e2fsdroid.c +++ b/contrib/android/e2fsdroid.c @@ -22,6 +22,11 @@ #define UID_GID_MAP_MAX_EXTENTS 340 #endif +// disable leak detection, breaks host asan build +const char *__asan_default_options() { + return "detect_leaks=0"; +} + static char *prog_name = "e2fsdroid"; static char *in_file; static char *block_list; diff --git a/misc/Android.bp b/misc/Android.bp index 846edf95..4edac23e 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -128,7 +128,7 @@ cc_binary { symlinks: ["mkfs.ext4.microdroid"], }, }, - installable: false, + no_full_install: true, stem: "mke2fs", visibility: ["//packages/modules/Virtualization/microdroid"], } |