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

Revert submission 9940985-qpr1-dev merge

Browse Source 
Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes:

Change-Id: I48c73bcb0819f7cb4c41834cdd680e9e6c323be7
Exclude all builds containing Colin's original change
Meged-In: f0f2e2cf79
This commit is contained in:
Kimberly Kreider
2019-12-20 15:33:06 +00:00
parent 4ba82c9482
commit 8b81e98da4
3 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -1453,8 +1453,6 @@ func (j *Module) CompilerDeps() []string {
type Library struct {
Module
InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths)
}
func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {
@@ -1484,12 +1482,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.compile(ctx)
if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
var extraInstallDeps android.Paths
if j.InstallMixin != nil {
extraInstallDeps = j.InstallMixin(ctx, j.outputFile)
}
j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...)
ctx.ModuleName()+".jar", j.outputFile)
}
}