Merge changes I9e38ac73,I9412147f am: 45da465ef6
am: 0a93afc2b9
am: 331599f461
am: 76df6461c5
am: 0d3522cece
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532 Change-Id: Ia74c51187284aad60b8e700c488a60a0083f4cfc
This commit is contained in:
@@ -474,6 +474,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) android.Path {
|
||||
a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries()
|
||||
a.dexpreopter.classLoaderContexts = a.classLoaderContexts
|
||||
a.dexpreopter.manifestFile = a.mergedManifestFile
|
||||
a.dexpreopter.preventInstall = a.appProperties.PreventInstall
|
||||
|
||||
if ctx.ModuleName() != "framework-res" {
|
||||
a.Module.compile(ctx, a.aaptSrcJar)
|
||||
@@ -726,7 +727,9 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)
|
||||
|
||||
// Install the app package.
|
||||
if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() {
|
||||
if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() &&
|
||||
!a.appProperties.PreventInstall {
|
||||
|
||||
var extraInstalledPaths android.Paths
|
||||
for _, extra := range a.extraOutputFiles {
|
||||
installed := ctx.InstallFile(a.installDir, extra.Base(), extra)
|
||||
|
Reference in New Issue
Block a user