Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I417880c1689390ebdc9caabef705bce739bb0baf
Change-Id: Ie978c93db9016c520e95eaa72c5ec063c87d6b3d

1 files changed, 0 insertions, 12 deletions

diff --git a/apex/builder.go b/apex/builder.go
index b04a9d729..879406567 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -764,18 +764,6 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) {
 	implicitInputs = append(implicitInputs, noticeAssetPath)
 	optFlags = append(optFlags, "--assets_dir "+filepath.Dir(noticeAssetPath.String()))
 
-	// Apexes which are supposed to be installed in builtin dirs(/system, etc)
-	// don't need hashtree for activation. Therefore, by removing hashtree from
-	// apex bundle (filesystem image in it, to be specific), we can save storage.
-	needHashTree := moduleMinSdkVersion.LessThanOrEqualTo(android.SdkVersion_Android10) ||
-		a.shouldGenerateHashtree()
-	if ctx.Config().ApexCompressionEnabled() && a.isCompressable() {
-		needHashTree = true
-	}
-	if !needHashTree {
-		optFlags = append(optFlags, "--no_hashtree")
-	}
-
 	if a.testOnlyShouldSkipPayloadSign() {
 		optFlags = append(optFlags, "--unsigned_payload")
 	}