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

Commit 4f8996aa authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

Merge "Include the hashtree in Q-launched modules." 

am: 9c121cd7

Change-Id: Ie19d36718f1f333f7acbe718fa48e16089e02f57
parents cdf31609 9c121cd7

apex/apex_test.go

+1 −0
Original line number Diff line number Diff line
@@ -3379,6 +3379,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
@@ -397,7 +397,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.