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

Merge "Set usesNonSdkApi in manifest when Platform_apis=true"

Browse Source
This commit is contained in:
David Brazdil
2019-02-19 09:53:34 +00:00
committed by Gerrit Code Review
parent dd739bbdf2 d25060aa2d
commit 1f9e90a304
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/aar.go
View File

@@ -77,6 +77,7 @@ type aapt struct {
isLibrary bool isLibrary bool
uncompressedJNI bool uncompressedJNI bool
useEmbeddedDex bool useEmbeddedDex bool
usesNonSdkApis bool
aaptProperties aaptProperties aaptProperties aaptProperties
} }
@@ -184,7 +185,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex
manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile) manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)
manifestPath := manifestMerger(ctx, manifestSrcPath, sdkContext, staticLibManifests, a.isLibrary, 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) linkFlags, linkDeps, resDirs, overlayDirs, rroDirs := a.aapt2Flags(ctx, sdkContext, manifestPath)

6
java/android_manifest.go
View File

@@ -44,7 +44,7 @@ var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger",
"libs") "libs")
func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext sdkContext, 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 var args []string
if isLibrary { 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 { if useEmbeddedDex {
args = append(args, "--use-embedded-dex=true") args = append(args, "--use-embedded-dex=true")
} }

2
java/app.go
View File

@@ -186,6 +186,8 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool {
} }
func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
a.aapt.usesNonSdkApis = Bool(a.Module.deviceProperties.Platform_apis)
aaptLinkFlags := []string{} aaptLinkFlags := []string{}
// Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided. // Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided.