Add hidden_api for java_import
Test: go java tests Test: m Bug: 160455085 Change-Id: Ib6e826e32ca73ceea0799b26145ad06b1e62a1bf
This commit is contained in:
10
java/java.go
10
java/java.go
@@ -1611,6 +1611,9 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
|
||||
|
||||
configurationName := j.ConfigurationName()
|
||||
primary := configurationName == ctx.ModuleName()
|
||||
// If the prebuilt is being used rather than the from source, skip this
|
||||
// module to prevent duplicated classes
|
||||
primary = primary && !j.IsReplacedByPrebuilt()
|
||||
|
||||
// Hidden API CSV generation and dex encoding
|
||||
dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, configurationName, primary, dexOutputFile, j.implementationJarFile,
|
||||
@@ -2681,6 +2684,13 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
return
|
||||
}
|
||||
|
||||
configurationName := j.BaseModuleName()
|
||||
primary := j.Prebuilt().UsePrebuilt()
|
||||
|
||||
// Hidden API CSV generation and dex encoding
|
||||
dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, configurationName, primary, dexOutputFile, outputFile,
|
||||
proptools.Bool(j.dexProperties.Uncompress_dex))
|
||||
|
||||
j.dexJarFile = dexOutputFile
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user