StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." am: 4238c5fe07 am: c952e7fad6 am: 855b5768cc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657320

Change-Id: I4b500f3da2e6c39832ae4c93de6b4eb8667096d7
This commit is contained in:
Treehugger Robot
2021-04-06 19:55:03 +00:00
committed by Automerger Merge Worker
parent 6c025c3929 855b5768cc
commit 76e7452f48
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/app.go
View File

@@ -380,7 +380,11 @@ func (a *AndroidApp) renameResourcesPackage() bool {
} }
func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
a.aapt.usesNonSdkApis = Bool(a.Module.deviceProperties.Platform_apis) usePlatformAPI := proptools.Bool(a.Module.deviceProperties.Platform_apis)
if ctx.Module().(android.SdkContext).SdkVersion().Kind == android.SdkModule {
usePlatformAPI = true
}
a.aapt.usesNonSdkApis = usePlatformAPI
// Ask manifest_fixer to add or update the application element indicating this app has no code. // Ask manifest_fixer to add or update the application element indicating this app has no code.
a.aapt.hasNoCode = !a.hasCode(ctx) a.aapt.hasNoCode = !a.hasCode(ctx)