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

Commit d25060aa authored by David Brazdil's avatar David Brazdil
Browse files

Set usesNonSdkApi in manifest when Platform_apis=true 

The Platform_apis field in CompilerDeviceProperties currently has no
effect. Unify the behaviour with make and run manifest_fixer.py to
encode the information in the manifest. This is used to exempt
bundled apps and platform tests from hidden API access checks without
having a fixed whitelist of packages.

Bug: 113315999
Bug: 124671117
Test: m UbSystemUiJankTests && \
      aapt d xmltree \
      target/product/taimen/data/app/UbSystemUiJankTests/UbSystemUiJankTests.apk \
      AndroidManifest.xml | grep usesNonSdkApi
Change-Id: I20c392d91ee6275ef8139fbeb5b9700385abbc80
parent f854d3e4

java/aar.go

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ type aapt struct { 
	isLibrary             bool

	uncompressedJNI       bool

	useEmbeddedDex        bool

	usesNonSdkApis        bool



	aaptProperties aaptProperties

}
@@ -184,7 +185,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex 
	manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)



	manifestPath := manifestMerger(ctx, manifestSrcPath, sdkContext, staticLibManifests, a.isLibrary,

		a.uncompressedJNI, a.useEmbeddedDex)

		a.uncompressedJNI, a.useEmbeddedDex, a.usesNonSdkApis)



	linkFlags, linkDeps, resDirs, overlayDirs, rroDirs := a.aapt2Flags(ctx, sdkContext, manifestPath)

java/android_manifest.go

+5 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger", 
	"libs")



func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext sdkContext,

	staticLibManifests android.Paths, isLibrary bool, uncompressedJNI, useEmbeddedDex bool) android.Path {

	staticLibManifests android.Paths, isLibrary, uncompressedJNI, useEmbeddedDex, usesNonSdkApis bool) android.Path {



	var args []string

	if isLibrary {
@@ -62,6 +62,10 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext 
		}

	}



	if usesNonSdkApis {

		args = append(args, "--uses-non-sdk-api")

	}



	if useEmbeddedDex {

		args = append(args, "--use-embedded-dex=true")

	}

java/app.go

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { 
}



func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {

	a.aapt.usesNonSdkApis = Bool(a.Module.deviceProperties.Platform_apis)



	aaptLinkFlags := []string{}



	// Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided.