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

Commit 716828ab authored by Jiyong Park's avatar Jiyong Park
Browse files

Revert "Don't build hiddenapi flags or encode dex for unbundled builds" 

This reverts commit 7b8a567f.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Merged-In: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
parent 3b98a509

java/hiddenapi_singleton.go

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext) 
	stubFlagsRule(ctx)



	// These rules depend on files located in frameworks/base, skip them if running in a tree that doesn't have them.

	if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().UnbundledBuild() {

	if ctx.Config().FrameworksBaseDirExists(ctx) {

		h.flags = flagsRule(ctx)

		h.metadata = metadataRule(ctx)

	} else {

java/java.go

+3 −5
Original line number Diff line number Diff line
@@ -1270,11 +1270,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path 
			return

		}



		if !ctx.Config().UnbundledBuild() {

		// Hidden API CSV generation and dex encoding

		dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile,

			j.deviceProperties.UncompressDex)

		}



		// merge dex jar with resources if necessary

		if j.resourceJar != nil {