Merge "Support new Doclava flag" (6a25de47) · Commits · e / os / android_build_soong

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())
		}

+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()