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

Commit 36227ea6 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Move hidden API encoding after resource merging am: 0bd5b062 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14678430

Change-Id: I36d57ebebb790535fd1ac5dd401737c6ad3fff17
parents 62a44c30 0bd5b062

java/base.go

+6 −6
Original line number Diff line number Diff line
@@ -1217,12 +1217,6 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
				return

			}



			// Initialize the hiddenapi structure.

			j.initHiddenAPI(ctx, dexOutputFile, j.implementationJarFile, j.dexProperties.Uncompress_dex)



			// Encode hidden API flags in dex file.

			dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile)



			// merge dex jar with resources if necessary

			if j.resourceJar != nil {

				jars := android.Paths{dexOutputFile, j.resourceJar}
@@ -1238,6 +1232,12 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
				}

			}



			// Initialize the hiddenapi structure.

			j.initHiddenAPI(ctx, dexOutputFile, j.implementationJarFile, j.dexProperties.Uncompress_dex)



			// Encode hidden API flags in dex file, if needed.

			dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile)



			j.dexJarFile = dexOutputFile



			// Dexpreopting

java/hiddenapi.go

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", bluepr 
		  echo "--output-dex=$tmpDir/dex-output/$$(basename $${INPUT_DEX})";

		done | xargs ${config.HiddenAPI} encode --api-flags=$flagsCsv $hiddenapiFlags &&

		${config.SoongZipCmd} $soongZipFlags -o $tmpDir/dex.jar -C $tmpDir/dex-output -f "$tmpDir/dex-output/classes*.dex" &&

		${config.MergeZipsCmd} -D -zipToNotStrip $tmpDir/dex.jar -stripFile "classes*.dex" -stripFile "**/*.uau" $out $tmpDir/dex.jar $in`,

		${config.MergeZipsCmd} -j -D -zipToNotStrip $tmpDir/dex.jar -stripFile "classes*.dex" -stripFile "**/*.uau" $out $tmpDir/dex.jar $in`,

	CommandDeps: []string{

		"${config.HiddenAPI}",

		"${config.SoongZipCmd}",