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

Commit 5b94c8c0 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge changes I83828f58,I1179235e 

* changes:
  Generate hashtree for compressed apexes
  Don't compress apexes produced by apex_test module
parents 53d69eb0 bc03588b

apex/builder.go

+5 −3
Original line number Diff line number Diff line
@@ -517,6 +517,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
	outHostBinDir := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "bin").String()

	prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin")



	// Figure out if need to compress apex.

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



	if apexType == imageApex {

		////////////////////////////////////////////////////////////////////////////////////

		// Step 2: create canned_fs_config which encodes filemode,uid,gid of each files
@@ -631,7 +634,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			ctx.PropertyErrorf("test_only_no_hashtree", "not available")

			return

		}

		if moduleMinSdkVersion.GreaterThan(android.SdkVersion_Android10) || a.testOnlyShouldSkipHashtreeGeneration() {

		if (moduleMinSdkVersion.GreaterThan(android.SdkVersion_Android10) || a.testOnlyShouldSkipHashtreeGeneration()) && !compressionEnabled {

			// 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.
@@ -780,12 +783,11 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
	})

	a.outputFile = signedOutputFile



	// 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, false)



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

		a.isCompressed = true

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