From a8fb73be3258237caaa226df2aef6f4fea20d004 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 25 Nov 2024 16:51:25 +0900 Subject: apex: Do not compress EROFS APEX EROFS filesystem already compresses its contents. Hence no need to compress the APEX. Bug: 380786910 Test: m --no-skip-soong-tests Change-Id: I25d44cbf98efc6b84db172fa2120e080344d9ddc --- apex/apex_test.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 5b5fe5ff1..5a5173474 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -9049,6 +9049,33 @@ func TestCompressedApex(t *testing.T) { ensureContains(t, androidMk, "LOCAL_MODULE_STEM := myapex.capex\n") } +func TestCompressedApexIsDisabledWhenUsingErofs(t *testing.T) { + t.Parallel() + ctx := testApex(t, ` + apex { + name: "myapex", + key: "myapex.key", + compressible: true, + updatable: false, + payload_fs_type: "erofs", + } + apex_key { + name: "myapex.key", + public_key: "testkey.avbpubkey", + private_key: "testkey.pem", + } + `, + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.CompressedApex = proptools.BoolPtr(true) + }), + ) + + compressRule := ctx.ModuleForTests("myapex", "android_common_myapex").MaybeRule("compressRule") + if compressRule.Rule != nil { + t.Error("erofs apex should not be compressed") + } +} + func TestApexSet_ShouldRespectCompressedApexFlag(t *testing.T) { t.Parallel() for _, compressionEnabled := range []bool{true, false} { -- cgit v1.2.3-59-g8ed1b