Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/pla…

…tform/external/e2fsprogs into vic-qpr1 Android 15.0.0 Release 6 (AP4A.241205.013) * tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/external/e2fsprogs: Revert^2 "Allow system e2fsck to run in early init." Revert "Allow system e2fsck to run in early init." Allow system e2fsck to run in early init. Update visibility according to the change AVF directories layout Only use static libc++ on host tool. Change-Id: I3bb2af2969f2d737299adc6d859fca4c5479a0d7
StatiXOS · Dec 6, 2024 · ef41d61 · ef41d61
2 parents 2161b83 + 3ca98e2
commit ef41d61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
@@ -67,6 +67,7 @@ cc_binary {
 
     shared_libs: e2fsck_libs,
     required: ["badblocks"],
+    bootstrap: true,
 }
 
 cc_binary {

diff --git a/misc/Android.bp b/misc/Android.bp
@@ -130,7 +130,7 @@ cc_binary {
     },
     no_full_install: true,
     stem: "mke2fs",
-    visibility: ["//packages/modules/Virtualization/microdroid"],
+    visibility: ["//packages/modules/Virtualization/build/microdroid"],
 }
 
 //##########################################################################