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

Commit ca913390 authored by Dario Freni's avatar Dario Freni
Browse files

Allow building unsigned APEXs payload for testing. 

Bug: 148447155
Test: built a testing apex with unsigned payload.
Merged-In: I95aa3f11ff1adc1421fcd7ed5a356ee531a0a818
Change-Id: I95aa3f11ff1adc1421fcd7ed5a356ee531a0a818
(cherry picked from commit 98410fd9)
parent 867dfd52

apex/apex.go

+8 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,10 @@ type apexBundleProperties struct { 
	// Should be only used in tests#.

	Test_only_no_hashtree *bool



	// Whenever apex_payload.img of the APEX should not be dm-verity signed.

	// Should be only used in tests#.

	Test_only_unsigned_payload *bool



	IsCoverageVariant bool `blueprint:"mutated"`



	// Whether this APEX is considered updatable or not. When set to true, this will enforce additional
@@ -1562,6 +1566,10 @@ func (a *apexBundle) testOnlyShouldSkipHashtreeGeneration() bool { 
	return proptools.Bool(a.properties.Test_only_no_hashtree)

}



func (a *apexBundle) testOnlyShouldSkipPayloadSign() bool {

	return proptools.Bool(a.properties.Test_only_unsigned_payload)

}



func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {

	if a.vndkApex {

		return cc.VendorVariationPrefix + a.vndkVersion(config)

apex/builder.go

+4 −0
Original line number Diff line number Diff line
@@ -493,6 +493,10 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			optFlags = append(optFlags, "--no_hashtree")

		}



		if a.testOnlyShouldSkipPayloadSign() {

			optFlags = append(optFlags, "--unsigned_payload")

		}



		if a.properties.Apex_name != nil {

			// If apex_name is set, apexer can skip checking if key name matches with apex name.

			// Note that apex_manifest is also mended.