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

Commit f1b5b4b6 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Support new Doclava flag" am: 6a25de47 

am: 9e4e57d5

Change-Id: I39afcee5314f41cf52f9121819a73eba434ec3f3
parents 410f48ca 9e4e57d5

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData { 
				if ddoc.apiFile != nil {

					fmt.Fprintln(w, apiFilePrefix+"API_FILE := ", ddoc.apiFile.String())

				}

				if ddoc.dexApiFile != nil {

					fmt.Fprintln(w, apiFilePrefix+"DEX_API_FILE := ", ddoc.dexApiFile.String())

				}

				if ddoc.privateApiFile != nil {

					fmt.Fprintln(w, apiFilePrefix+"PRIVATE_API_FILE := ", ddoc.privateApiFile.String())

				}

java/droiddoc.go

+10 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ type DroiddocProperties struct { 
	// 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
@@ -266,6 +269,7 @@ type Droiddoc struct { 


	properties        DroiddocProperties

	apiFile           android.WritablePath

	dexApiFile        android.WritablePath

	privateApiFile    android.WritablePath

	privateDexApiFile android.WritablePath

	removedApiFile    android.WritablePath
@@ -753,6 +757,12 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		implicitOutputs = append(implicitOutputs, d.privateApiFile)

	}



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

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

		args = args + " -dexApi " + d.dexApiFile.String()

		implicitOutputs = append(implicitOutputs, d.dexApiFile)

	}



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

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

		args = args + " -privateDexApi " + d.privateDexApiFile.String()