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

Merge "Allow for setting a logging_parent for an Android App."

Browse Source
This commit is contained in:
Treehugger Robot
2020-02-18 22:57:31 +00:00
committed by Gerrit Code Review
parent 207b18ca35 5b16dfb39a
commit 2f94e85f14
6 changed files with 141 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/aar.go
View File

@@ -101,6 +101,7 @@ type aapt struct {
usesNonSdkApis bool
sdkLibraries []string
hasNoCode bool
LoggingParent string
splitNames []string
splits []split
@@ -234,7 +235,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex
manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)
manifestPath := manifestFixer(ctx, manifestSrcPath, sdkContext, sdkLibraries,
a.isLibrary, a.useEmbeddedNativeLibs, a.usesNonSdkApis, a.useEmbeddedDex, a.hasNoCode)
a.isLibrary, a.useEmbeddedNativeLibs, a.usesNonSdkApis, a.useEmbeddedDex, a.hasNoCode,
a.LoggingParent)
// Add additional manifest files to transitive manifests.
additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)