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

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

Include the hashtree in Q-launched modules. 

For post-Q modules, we can avoid building the hashtree also in the
unbundled build case, since the device will regenerate the hashtree
locally. This CL simplifies the logic so that the build rules apply
regardless of the build being bundled or unbundled -- after all, bundled
build are only really valid for development purposes.

Fix: 147600151
Test: unit test;
m com.android.conscrypt and manual inspection of apexer invocation
(option no_hashtree not present)
m com.android.neuralnetworks and manual inspection of apexer invocation
(option no_hashtree present)

Change-Id: Ib4cc6149d3beac5df7e23a65a3b7ee6b0d68e395
parent ee76fba9

apex/apex_test.go

+1 −0
Original line number Diff line number Diff line
@@ -3265,6 +3265,7 @@ func TestLegacyAndroid10Support(t *testing.T) { 
	module := ctx.ModuleForTests("myapex", "android_common_myapex_image")

	args := module.Rule("apexRule").Args

	ensureContains(t, args["opt_flags"], "--manifest_json "+module.Output("apex_manifest.json").Output.String())

	ensureNotContains(t, args["opt_flags"], "--no_hashtree")

}



func TestJavaSDKLibrary(t *testing.T) {

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			ctx.PropertyErrorf("test_only_no_hashtree", "not available")

			return

		}

		if (!ctx.Config().UnbundledBuild() && a.installable()) || a.testOnlyShouldSkipHashtreeGeneration() {

		if !proptools.Bool(a.properties.Legacy_android10_support) || a.testOnlyShouldSkipHashtreeGeneration() {

			// 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.