From a7bb86b48e81efe7d4e1e8268b365efca7d5296f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 27 May 2021 12:31:03 +0100 Subject: [PATCH] Remove support for removed_dex_api_filename Nothing uses this argument anymore, so simplify the droidstubs code by removing the argument. Bug: 189426360 Test: m Change-Id: I0e4b84d73a954b3819db1149be3da287cf604eec --- java/droidstubs.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/java/droidstubs.go b/java/droidstubs.go index 566f7e30d..2154ec943 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -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 _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())