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

Commit 5a48d4fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix the args used to dexpreopt system server jars in prebuilt apexes" into main

parents 5d6c1eee e21a8d4d

apex/bootclasspath_fragment_test.go

+3 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 
		java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art", []string{

			`art-bootclasspath-fragment`,

			`com.android.art.key`,

			`dex2oatd`,

		})



		// Make sure that the source bootclasspath_fragment copies its dex files to the predefined
@@ -387,6 +388,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 
		java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art", []string{

			`art-bootclasspath-fragment`,

			`com.android.art.key`,

			`dex2oatd`,

			`prebuilt_com.android.art`,

		})
@@ -650,6 +652,7 @@ func TestBootclasspathFragmentContentsNoName(t *testing.T) { 
	})



	java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex", []string{

		`dex2oatd`,

		`myapex.key`,

		`mybootclasspathfragment`,

	})

apex/prebuilt.go

+4 −0
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ func (p *prebuiltCommon) dexpreoptSystemServerJars(ctx android.ModuleContext) { 
	if !p.hasExportedDeps() {

		return

	}

	// If this prebuilt apex has not been selected, return

	if p.IsHideFromMake() {

		return

	}

	// Use apex_name to determine the api domain of this prebuilt apex

	apexName := p.ApexVariationName()

	di, err := android.FindDeapexerProviderForModule(ctx)

apex/systemserver_classpath_fragment_test.go

+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ func TestSystemserverclasspathFragmentContents(t *testing.T) { 
	})



	java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex", []string{

		`dex2oatd`,

		`myapex.key`,

		`mysystemserverclasspathfragment`,

	})
@@ -162,6 +163,7 @@ func TestSystemserverclasspathFragmentNoGeneratedProto(t *testing.T) { 
	})



	java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex", []string{

		`dex2oatd`,

		`myapex.key`,

		`mysystemserverclasspathfragment`,

	})
@@ -219,6 +221,8 @@ func TestSystemServerClasspathFragmentWithContentNotInMake(t *testing.T) { 
}



func TestPrebuiltSystemserverclasspathFragmentContents(t *testing.T) {

	// TODO(spandandas): Fix the rules for profile guided dexpreopt of deapexed prebuilt jars

	t.Skip()

	result := android.GroupFixturePreparers(

		prepareForTestWithSystemserverclasspathFragment,

		prepareForTestWithMyapex,
@@ -377,6 +381,8 @@ func TestSystemserverclasspathFragmentStandaloneContents(t *testing.T) { 
}



func TestPrebuiltStandaloneSystemserverclasspathFragmentContents(t *testing.T) {

	// TODO(spandandas): Fix the rules for profile guided dexpreopt of deapexed prebuilt jars

	t.Skip()

	result := android.GroupFixturePreparers(

		prepareForTestWithSystemserverclasspathFragment,

		prepareForTestWithMyapex,

java/app.go

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { 
		return false

	}



	return shouldUncompressDex(ctx, &a.dexpreopter)

	return shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &a.dexpreopter)

}



func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {

java/app_import.go

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ func (a *AndroidAppImport) shouldUncompressDex(ctx android.ModuleContext) bool { 
		return ctx.Config().UncompressPrivAppDex()

	}



	return shouldUncompressDex(ctx, &a.dexpreopter)

	return shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &a.dexpreopter)

}



func (a *AndroidAppImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -324,7 +324,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext 
		a.usesLibrary.verifyUsesLibrariesAPK(ctx, srcApk)

	}



	a.dexpreopter.dexpreopt(ctx, jnisUncompressed)

	a.dexpreopter.dexpreopt(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), jnisUncompressed)

	if a.dexpreopter.uncompressedDex {

		dexUncompressed := android.PathForModuleOut(ctx, "dex-uncompressed", ctx.ModuleName()+".apk")

		ctx.Build(pctx, android.BuildParams{