Automatically set compile_dex:true and hostdex:true for APEX variants
... unless they are turned off explicitly. Bug: 147221965 Test: m Change-Id: I6b91d6409d9cf06ad09467c53d5d51a9c693256e
This commit is contained in:
10
java/java.go
10
java/java.go
@@ -1475,6 +1475,16 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
|
||||
|
||||
j.implementationAndResourcesJar = implementationAndResourcesJar
|
||||
|
||||
// Enable dex compilation for the APEX variants, unless it is disabled explicitly
|
||||
if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && !j.IsForPlatform() {
|
||||
if j.deviceProperties.Compile_dex == nil {
|
||||
j.deviceProperties.Compile_dex = proptools.BoolPtr(true)
|
||||
}
|
||||
if j.deviceProperties.Hostdex == nil {
|
||||
j.deviceProperties.Hostdex = proptools.BoolPtr(true)
|
||||
}
|
||||
}
|
||||
|
||||
if ctx.Device() && j.hasCode(ctx) &&
|
||||
(Bool(j.properties.Installable) || Bool(j.deviceProperties.Compile_dex)) {
|
||||
// Dex compilation
|
||||
|
Reference in New Issue
Block a user