Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8008f95 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Add property to apex soong modules to forcefully compress an APEX 

This makes creating compressed APEX artifacts for testing simpler.

Bug: 172911820
Test: atest apex_compression_platform_tests
Change-Id: I77b8bea4662c273420e7b37d5fde181b86c9cb78
parent d8065c60

apex/apex.go

+9 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ type apexBundleProperties struct { 
	// used in tests.

	Test_only_unsigned_payload *bool



	// Whenever apex should be compressed, regardless of product flag used. Should be only

	// used in tests.

	Test_only_force_compression *bool



	IsCoverageVariant bool `blueprint:"mutated"`



	// List of sanitizer names that this APEX is enabled for
@@ -1235,6 +1239,11 @@ func (a *apexBundle) testOnlyShouldSkipPayloadSign() bool { 
	return proptools.Bool(a.properties.Test_only_unsigned_payload)

}



// See the test_only_force_compression property

func (a *apexBundle) testOnlyShouldForceCompression() bool {

	return proptools.Bool(a.properties.Test_only_force_compression)

}



// These functions are interfacing with cc/sanitizer.go. The entire APEX (along with all of its

// members) can be sanitized, either forcibly, or by the global configuration. For some of the

// sanitizers, extra dependencies can be forcibly added as well.

apex/builder.go

+6 −2
Original line number Diff line number Diff line
@@ -763,9 +763,13 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
	})

	a.outputFile = signedOutputFile



	// Process APEX compression if enabled

	// Process APEX compression if enabled or forced

	if ctx.ModuleDir() != "system/apex/apexd/apexd_testdata" && a.testOnlyShouldForceCompression() {

		ctx.PropertyErrorf("test_only_force_compression", "not available")

		return

	}

	compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, true)

	if compressionEnabled && apexType == imageApex {

	if apexType == imageApex && (compressionEnabled || a.testOnlyShouldForceCompression()) {

		a.isCompressed = true

		unsignedCompressedOutputFile := android.PathForModuleOut(ctx, a.Name()+".capex.unsigned")