Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f15a9f8 authored by Anton Hansson's avatar Anton Hansson
Browse files

Remove unused arguments in droiddoc 

Nothing passes these arguments, so it's dead code.

There is a lot of other cruft in this file that is effectively
dead code, but required further cleanup.

Bug: 152479829
Test: m
Change-Id: Ib2630d4d49f21003b17e2331b0900e8df0a27e66
Merged-In: Ib2630d4d49f21003b17e2331b0900e8df0a27e66
(cherry picked from commit 0ee713aa)
parent 27d9ec18

java/droiddoc.go

+0 −114
Original line number Diff line number Diff line
@@ -177,37 +177,15 @@ type DroiddocProperties struct { 
	// filegroup or genrule can be included within this property.

	Knowntags []string `android:"path"`



	// the tag name used to distinguish if the API files belong to public/system/test.

	Api_tag_name *string



	// the generated public API filename by Doclava.

	Api_filename *string



	// the generated public Dex API filename by Doclava.

	Dex_api_filename *string



	// the generated private API filename by Doclava.

	Private_api_filename *string



	// the generated private Dex API filename by Doclava.

	Private_dex_api_filename *string



	// the generated removed API filename by Doclava.

	Removed_api_filename *string



	// the generated removed Dex API filename by Doclava.

	Removed_dex_api_filename *string



	// mapping of dex signatures to source file and line number. This is a temporary property and

	// will be deleted; you probably shouldn't be using it.

	Dex_mapping_filename *string



	// the generated exact API filename by Doclava.

	Exact_api_filename *string



	// the generated proguard filename by Doclava.

	Proguard_filename *string



	// if set to false, don't allow droiddoc to generate stubs source files. Defaults to true.

	Create_stubs *bool
@@ -229,37 +207,15 @@ type DroiddocProperties struct { 
}



type DroidstubsProperties struct {

	// the tag name used to distinguish if the API files belong to public/system/test.

	Api_tag_name *string



	// the generated public API filename by Metalava.

	Api_filename *string



	// the generated public Dex API filename by Metalava.

	Dex_api_filename *string



	// the generated private API filename by Metalava.

	Private_api_filename *string



	// the generated private Dex API filename by Metalava.

	Private_dex_api_filename *string



	// the generated removed API filename by Metalava.

	Removed_api_filename *string



	// the generated removed Dex API filename by Metalava.

	Removed_dex_api_filename *string



	// mapping of dex signatures to source file and line number. This is a temporary property and

	// will be deleted; you probably shouldn't be using it.

	Dex_mapping_filename *string



	// the generated exact API filename by Metalava.

	Exact_api_filename *string



	// the generated proguard filename by Metalava.

	Proguard_filename *string



	Check_api struct {

		Last_released ApiToCheck
@@ -731,14 +687,9 @@ type Droiddoc struct { 


	properties        DroiddocProperties

	apiFile           android.WritablePath

	dexApiFile        android.WritablePath

	privateApiFile    android.WritablePath

	privateDexApiFile android.WritablePath

	removedApiFile    android.WritablePath

	removedDexApiFile android.WritablePath

	exactApiFile      android.WritablePath

	apiMappingFile    android.WritablePath

	proguardFile      android.WritablePath



	checkCurrentApiTimestamp      android.WritablePath

	updateCurrentApiTimestamp     android.WritablePath
@@ -876,41 +827,11 @@ func (d *Droiddoc) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuilde 
		cmd.FlagWithOutput("-removedApi ", d.removedApiFile)

	}



	if String(d.properties.Private_api_filename) != "" {

		d.privateApiFile = android.PathForModuleOut(ctx, String(d.properties.Private_api_filename))

		cmd.FlagWithOutput("-privateApi ", d.privateApiFile)

	}



	if String(d.properties.Dex_api_filename) != "" {

		d.dexApiFile = android.PathForModuleOut(ctx, String(d.properties.Dex_api_filename))

		cmd.FlagWithOutput("-dexApi ", d.dexApiFile)

	}



	if String(d.properties.Private_dex_api_filename) != "" {

		d.privateDexApiFile = android.PathForModuleOut(ctx, String(d.properties.Private_dex_api_filename))

		cmd.FlagWithOutput("-privateDexApi ", d.privateDexApiFile)

	}



	if String(d.properties.Removed_dex_api_filename) != "" {

		d.removedDexApiFile = android.PathForModuleOut(ctx, String(d.properties.Removed_dex_api_filename))

		cmd.FlagWithOutput("-removedDexApi ", d.removedDexApiFile)

	}



	if String(d.properties.Exact_api_filename) != "" {

		d.exactApiFile = android.PathForModuleOut(ctx, String(d.properties.Exact_api_filename))

		cmd.FlagWithOutput("-exactApi ", d.exactApiFile)

	}



	if String(d.properties.Dex_mapping_filename) != "" {

		d.apiMappingFile = android.PathForModuleOut(ctx, String(d.properties.Dex_mapping_filename))

		cmd.FlagWithOutput("-apiMapping ", d.apiMappingFile)

	}



	if String(d.properties.Proguard_filename) != "" {

		d.proguardFile = android.PathForModuleOut(ctx, String(d.properties.Proguard_filename))

		cmd.FlagWithOutput("-proguard ", d.proguardFile)

	}



	if BoolDefault(d.properties.Create_stubs, true) {

		cmd.FlagWithArg("-stubs ", stubsDir.String())

	}
@@ -1210,14 +1131,9 @@ type Droidstubs struct { 
	apiFile                 android.WritablePath

	apiXmlFile              android.WritablePath

	lastReleasedApiXmlFile  android.WritablePath

	dexApiFile              android.WritablePath

	privateApiFile          android.WritablePath

	privateDexApiFile       android.WritablePath

	removedApiFile          android.WritablePath

	removedDexApiFile       android.WritablePath

	apiMappingFile          android.WritablePath

	exactApiFile            android.WritablePath

	proguardFile            android.WritablePath

	nullabilityWarningsFile android.WritablePath



	checkCurrentApiTimestamp      android.WritablePath
@@ -1322,41 +1238,11 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil 
		cmd.FlagWithOutput("--removed-api ", d.removedApiFile)

	}



	if String(d.properties.Private_api_filename) != "" {

		d.privateApiFile = android.PathForModuleOut(ctx, String(d.properties.Private_api_filename))

		cmd.FlagWithOutput("--private-api ", d.privateApiFile)

	}



	if String(d.properties.Dex_api_filename) != "" {

		d.dexApiFile = android.PathForModuleOut(ctx, String(d.properties.Dex_api_filename))

		cmd.FlagWithOutput("--dex-api ", d.dexApiFile)

	}



	if String(d.properties.Private_dex_api_filename) != "" {

		d.privateDexApiFile = android.PathForModuleOut(ctx, String(d.properties.Private_dex_api_filename))

		cmd.FlagWithOutput("--private-dex-api ", d.privateDexApiFile)

	}



	if String(d.properties.Removed_dex_api_filename) != "" {

		d.removedDexApiFile = android.PathForModuleOut(ctx, String(d.properties.Removed_dex_api_filename))

		cmd.FlagWithOutput("--removed-dex-api ", d.removedDexApiFile)

	}



	if String(d.properties.Exact_api_filename) != "" {

		d.exactApiFile = android.PathForModuleOut(ctx, String(d.properties.Exact_api_filename))

		cmd.FlagWithOutput("--exact-api ", d.exactApiFile)

	}



	if String(d.properties.Dex_mapping_filename) != "" {

		d.apiMappingFile = android.PathForModuleOut(ctx, String(d.properties.Dex_mapping_filename))

		cmd.FlagWithOutput("--dex-api-mapping ", d.apiMappingFile)

	}



	if String(d.properties.Proguard_filename) != "" {

		d.proguardFile = android.PathForModuleOut(ctx, String(d.properties.Proguard_filename))

		cmd.FlagWithOutput("--proguard ", d.proguardFile)

	}



	if Bool(d.properties.Write_sdk_values) {

		d.metadataDir = android.PathForModuleOut(ctx, "metadata")

		cmd.FlagWithArg("--sdk-values ", d.metadataDir.String())