Merge ab/AP4A.240925.013 into aosp-main-future
Bug: 370570306
Merged-In: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59
Change-Id: Ia7a046ccb98e15569c5e9523497d9ef986771643
diff --git a/Android.bp b/Android.bp
index abb419e..3c7ba4d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,11 +44,8 @@
"assemble_cvd",
"dtc",
"e2fsdroid",
- "lz4",
"make_f2fs",
- "mkbootfs",
"mke2fs",
- "replace_ramdisk_modules",
"rpmb_dev",
"sload_f2fs",
"toybox",
@@ -60,8 +57,7 @@
cmd: "mkdir -p $(genDir)/trusty-host_package/bin && " +
"cp -f -t $(genDir)/trusty-host_package/bin " +
"$(location adb) $(location assemble_cvd) $(location dtc) " +
- "$(location e2fsdroid) $(location lz4) $(location make_f2fs) $(location mkbootfs) " +
- "$(location mke2fs) $(location replace_ramdisk_modules) " +
+ "$(location e2fsdroid) $(location make_f2fs) $(location mke2fs) " +
"$(location rpmb_dev) $(location sload_f2fs) " +
"$(location toybox) $(location trusty_qemu_system_aarch64) && " +
"cp -f -r `dirname $(location dtc)`/../lib64 $(genDir)/trusty-host_package/ && " +