Fully switch to mke2fs; set policies everywhere.
Older make_ext4fs doesn't support enabling quotas, so switch everyone
over to using mke2fs for adoptable storage.
Remove UUID check so that we start setting ext4-crypto policies on
adoptable storage devices; a future change will handle the actual
key management.
Bug: 30230655, 36757864
Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Change-Id: I021f85b1be8431044c239521c37be96534682746
diff --git a/Android.mk b/Android.mk
index 4971ec7..9dba651 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,6 +88,8 @@
vold_cflags += -DTARGET_USES_MKE2FS
required_modules += mke2fs
else
+ # Adoptable storage has fully moved to mke2fs, so we need both tools
+ required_modules += mke2fs
required_modules += make_ext4fs
endif
endif