Merge "Remove support for removed_dex_api_filename" into sc-dev
This commit is contained in:
commit
ea2d99c1a0
1 changed files with 0 additions and 9 deletions
|
@ -51,7 +51,6 @@ type Droidstubs struct {
|
|||
lastReleasedApiXmlFile android.WritablePath
|
||||
privateApiFile android.WritablePath
|
||||
removedApiFile android.WritablePath
|
||||
removedDexApiFile android.WritablePath
|
||||
nullabilityWarningsFile android.WritablePath
|
||||
|
||||
checkCurrentApiTimestamp android.WritablePath
|
||||
|
@ -79,9 +78,6 @@ type DroidstubsProperties struct {
|
|||
// the generated removed API filename by Metalava, defaults to <module>_removed.txt
|
||||
Removed_api_filename *string
|
||||
|
||||
// the generated removed Dex API filename by Metalava.
|
||||
Removed_dex_api_filename *string
|
||||
|
||||
Check_api struct {
|
||||
Last_released ApiToCheck
|
||||
|
||||
|
@ -274,11 +270,6 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil
|
|||
d.removedApiFilePath = android.PathForModuleSrc(ctx, sourceRemovedApiFile)
|
||||
}
|
||||
|
||||
if String(d.properties.Removed_dex_api_filename) != "" {
|
||||
d.removedDexApiFile = android.PathForModuleOut(ctx, "metalava", String(d.properties.Removed_dex_api_filename))
|
||||
cmd.FlagWithOutput("--removed-dex-api ", d.removedDexApiFile)
|
||||
}
|
||||
|
||||
if Bool(d.properties.Write_sdk_values) {
|
||||
d.metadataDir = android.PathForModuleOut(ctx, "metalava", "metadata")
|
||||
cmd.FlagWithArg("--sdk-values ", d.metadataDir.String())
|
||||
|
|
Loading…
Reference in a new issue